bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-10 21:33:16 +00:00
Code Issues Releases Wiki Activity

notes about sharing

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-11 17:29:45 -04:00
parent d619167c02
commit 5f130bdda7
4 changed files with 71 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/organization/views/organizationSubvaultsAdd.html
View File

@@ -14,6 +14,13 @@
<label for="email">Name</label> <label for="email">Name</label>
<input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field /> <input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field />
</div> </div>
<div class="callout callout-default">
<h4><i class="fa fa-info-circle"></i> Note</h4>
<p>
After creating the subvault, you can associate a user to it by selecting a specific user on the "People" page.
</p>
<p>You can associate logins to the subvault by sharing from "My vault".</p>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading"> <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
@@ -22,4 +29,3 @@
<button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button> <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
</div> </div>
</form> </form>

8
src/app/organization/views/organizationSubvaultsEdit.html
View File

@@ -14,6 +14,14 @@
<label for="email">Name</label> <label for="email">Name</label>
<input type="text" id="name" name="Name" ng-model="subvault.name" class="form-control" required api-field /> <input type="text" id="name" name="Name" ng-model="subvault.name" class="form-control" required api-field />
</div> </div>
<div class="callout callout-default">
<h4><i class="fa fa-info-circle"></i> Note</h4>
<p>
Select "Users" from the listing options to manage existing users for this subvault. Associate new users by
managing the user's subvault access on the "People" page.
</p>
<p>You can associate logins to this subvault by sharing from "My vault".</p>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading"> <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">

11
src/app/vault/vaultShareController.js
View File

@@ -1,7 +1,8 @@
angular angular
.module('bit.vault') .module('bit.vault')
.controller('vaultShareController', function ($scope, apiService, $uibModalInstance, authService, cipherService, loginId, $analytics) { .controller('vaultShareController', function ($scope, apiService, $uibModalInstance, authService, cipherService,
loginId, $analytics, $state) {
$analytics.eventTrack('vaultShareController', { category: 'Modal' }); $analytics.eventTrack('vaultShareController', { category: 'Modal' });
$scope.model = {}; $scope.model = {};
$scope.login = {}; $scope.login = {};
@@ -30,7 +31,7 @@
setFirstOrg = false; setFirstOrg = false;
for (var i in profile.organizations) { for (var i in profile.organizations) {
if (profile.organizations.hasOwnProperty(i)) { if (profile.organizations.hasOwnProperty(i) && profile.organizations[i].enabled) {
orgs.push({ orgs.push({
id: profile.organizations[i].id, id: profile.organizations[i].id,
name: profile.organizations[i].name name: profile.organizations[i].name
@@ -111,4 +112,10 @@
$scope.close = function () { $scope.close = function () {
$uibModalInstance.dismiss('cancel'); $uibModalInstance.dismiss('cancel');
}; };
$scope.createOrg = function () {
$state.go('backend.user.settingsCreateOrg').then(function () {
$uibModalInstance.dismiss('cancel');
});
};
}); });

85
src/app/vault/views/vaultShare.html
View File

@@ -11,46 +11,55 @@
<li ng-repeat="e in form.$errors">{{e}}</li> <li ng-repeat="e in form.$errors">{{e}}</li>
</ul> </ul>
</div> </div>
<div class="form-group"> <div ng-show="!organizations.length" class="callout callout-default">
<label for="organization">Organization</label> <span>*</span> <h4><i class="fa fa-info-circle"></i> No Organizations</h4>
<select id="organization" name="Organization" ng-model="model.organizationId" class="form-control"> <p>You do not belong to any organizations.</p>
<option ng-repeat="org in organizations | orderBy: ['name']" value="{{org.id}}">{{org.name}}</option> <a ng-click="createOrg()" class="btn btn-default btn-flat">
</select> Create an Organization
</a>
</div> </div>
<div ng-show="loadingSubvaults && !orgSubvaults.length"> <div ng-show="organizations.length">
<p>Loading...</p> <div class="form-group">
</div> <label for="organization">Organization</label> <span>*</span>
<div ng-show="!loadingSubvaults && !orgSubvaults.length"> <select id="organization" name="Organization" ng-model="model.organizationId" class="form-control">
<p>No subvaults with write access.</p> <option ng-repeat="org in organizations | orderBy: ['name']" value="{{org.id}}">{{org.name}}</option>
</div> </select>
<div class="table-responsive" ng-show="orgSubvaults.length" style="margin: 0;"> </div>
<table class="table table-striped table-hover" style="margin: 0;"> <div ng-show="loadingSubvaults && !orgSubvaults.length">
<thead> <p>Loading...</p>
<tr> </div>
<th style="width: 40px;"> <div ng-show="!loadingSubvaults && !orgSubvaults.length">
<input type="checkbox" <p>No subvaults with write access.</p>
ng-checked="allSelected()" </div>
ng-click="toggleSubvaultSelectionAll($event)"> <div class="table-responsive" ng-show="orgSubvaults.length" style="margin: 0;">
</th> <table class="table table-striped table-hover" style="margin: 0;">
<th>Subvault</th> <thead>
</tr> <tr>
</thead> <th style="width: 40px;">
<tbody> <input type="checkbox"
<tr ng-repeat="subvault in orgSubvaults = ng-checked="allSelected()"
ng-click="toggleSubvaultSelectionAll($event)">
</th>
<th>Subvault</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="subvault in orgSubvaults =
(subvaults | filter: { organizationId: model.organizationId } | orderBy: ['name'])"> (subvaults | filter: { organizationId: model.organizationId } | orderBy: ['name'])">
<td valign="middle"> <td valign="middle">
<input type="checkbox" <input type="checkbox"
name="selectedSubvaults[]" name="selectedSubvaults[]"
value="{{subvault.id}}" value="{{subvault.id}}"
ng-checked="subvaultSelected(subvault)" ng-checked="subvaultSelected(subvault)"
ng-click="toggleSubvaultSelection(subvault.id)"> ng-click="toggleSubvaultSelection(subvault.id)">
</td> </td>
<td valign="middle" ng-click="toggleSubvaultSelection(subvault.id)"> <td valign="middle" ng-click="toggleSubvaultSelection(subvault.id)">
{{subvault.name}} {{subvault.name}}
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">