1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-19 02:51:14 +02:00

track by on repeats

This commit is contained in:
Kyle Spearrin 2017-04-18 15:34:16 -04:00
parent 2425eb0ff8
commit 214274f495
7 changed files with 15 additions and 16 deletions

View File

@ -25,14 +25,11 @@
<div ng-show="!filteredUsers.length && !filterSearch"> <div ng-show="!filteredUsers.length && !filterSearch">
Loading... Loading...
</div> </div>
<div ng-show="!filteredUsers.length && filterSearch">
No people to list.
</div>
<div class="table-responsive" ng-show="filteredUsers.length"> <div class="table-responsive" ng-show="filteredUsers.length">
<table class="table table-striped table-hover table-vmiddle"> <table class="table table-striped table-hover table-vmiddle">
<tbody> <tbody>
<tr ng-repeat="user in filteredUsers = (users | filter: (filterSearch || '') | <tr ng-repeat="user in filteredUsers = (users | filter: (filterSearch || '') |
orderBy: ['type', 'name', 'email'])"> orderBy: ['type', 'name', 'email']) track by user.id">
<td style="width: 70px;"> <td style="width: 70px;">
<div class="btn-group" data-append-to="body"> <div class="btn-group" data-append-to="body">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

View File

@ -36,7 +36,7 @@
Loading... Loading...
</div> </div>
<div ng-show="!loading && !subvaults.length"> <div ng-show="!loading && !subvaults.length">
<p>No subvaults.</p> <p>No subvaults for your organization.</p>
</div> </div>
<div class="table-responsive" ng-show="subvaults.length" style="margin: 0;"> <div class="table-responsive" ng-show="subvaults.length" style="margin: 0;">
<table class="table table-striped table-hover" style="margin: 0;"> <table class="table table-striped table-hover" style="margin: 0;">

View File

@ -44,7 +44,7 @@
Loading... Loading...
</div> </div>
<div ng-show="!loading && !subvaults.length"> <div ng-show="!loading && !subvaults.length">
<p>No subvaults.</p> <p>No subvaults for your organization.</p>
</div> </div>
<div class="table-responsive" ng-show="subvaults.length" style="margin: 0;"> <div class="table-responsive" ng-show="subvaults.length" style="margin: 0;">
<table class="table table-striped table-hover" style="margin: 0;"> <table class="table table-striped table-hover" style="margin: 0;">
@ -60,7 +60,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="subvault in subvaults | orderBy: ['name']"> <tr ng-repeat="subvault in subvaults | orderBy: ['name'] track by subvault.id">
<td style="width: 40px;" valign="middle"> <td style="width: 40px;" valign="middle">
<input type="checkbox" <input type="checkbox"
name="selectedSubvaults[]" name="selectedSubvaults[]"

View File

@ -29,14 +29,14 @@
No subvaults to list. No subvaults to list.
</div> </div>
<div ng-show="!loading && !subvaults.length"> <div ng-show="!loading && !subvaults.length">
<p>No subvaults.</p> <p>There are no subvaults yet for your organization.</p>
<button type="button" ng-click="add()" class="btn btn-default btn-flat">Add a Subvault</button> <button type="button" ng-click="add()" class="btn btn-default btn-flat">Add a Subvault</button>
</div> </div>
<div class="table-responsive" ng-show="subvaults.length"> <div class="table-responsive" ng-show="subvaults.length">
<table class="table table-striped table-hover table-vmiddle"> <table class="table table-striped table-hover table-vmiddle">
<tbody> <tbody>
<tr ng-repeat="subvault in filteredSubvaults = (subvaults | filter: (filterSearch || '') | <tr ng-repeat="subvault in filteredSubvaults = (subvaults | filter: (filterSearch || '') |
orderBy: ['name'])"> orderBy: ['name']) track by subvault.id">
<td style="width: 70px;"> <td style="width: 70px;">
<div class="btn-group" data-append-to="body"> <div class="btn-group" data-append-to="body">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

View File

@ -7,12 +7,15 @@
Loading... Loading...
</div> </div>
<div ng-show="!loading && !users.length"> <div ng-show="!loading && !users.length">
<p>No users.</p> <p>
No users for this subvault. You can associate a new user to this subvault by
selecting a specific user on the "People" page.
</p>
</div> </div>
<div class="table-responsive" ng-show="users.length" style="margin: 0;"> <div class="table-responsive" ng-show="users.length" style="margin: 0;">
<table class="table table-striped table-hover table-vmiddle" style="margin: 0;"> <table class="table table-striped table-hover table-vmiddle" style="margin: 0;">
<tbody> <tbody>
<tr ng-repeat="user in users | orderBy: ['email']"> <tr ng-repeat="user in users | orderBy: ['email'] track by user.id">
<td style="width: 70px;"> <td style="width: 70px;">
<div class="btn-group" data-append-to=".modal"> <div class="btn-group" data-append-to=".modal">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

View File

@ -28,9 +28,8 @@
</div> </div>
</div> </div>
<div class="box-body" ng-class="{'no-padding': subvaultLogins.length}"> <div class="box-body" ng-class="{'no-padding': subvaultLogins.length}">
<div ng-show="!subvaultLogins.length"> <div ng-show="!subvaultLogins.length && subvault.id">No logins in this subvault.</div>
<p>No logins in this subvault.</p> <div ng-show="!subvaultLogins.length && !subvault.id">No unassigned logins.</div>
</div>
<div class="table-responsive" ng-show="subvaultLogins.length"> <div class="table-responsive" ng-show="subvaultLogins.length">
<table class="table table-striped table-hover table-vmiddle"> <table class="table table-striped table-hover table-vmiddle">
<tbody> <tbody>

View File

@ -27,7 +27,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="subvault in subvaults | orderBy: ['name']"> <tr ng-repeat="subvault in subvaults | orderBy: ['name'] track by subvault.id">
<td valign="middle"> <td valign="middle">
<input type="checkbox" <input type="checkbox"
name="selectedSubvaults[]" name="selectedSubvaults[]"