github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(users): fix invalid Authentication value (#1528)

pull/1516/head
Anthony Lapenna 2017-12-21 19:56:54 +01:00 committed by GitHub
parent e0b09f20b0
commit eec10541b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/components/users/users.html
View File

@ -118,6 +118,7 @@
title="Users" title-icon="fa-user" title="Users" title-icon="fa-user"
dataset="users" table-key="users" dataset="users" table-key="users"
order-by="Username" show-text-filter="true" order-by="Username" show-text-filter="true"
authentication-method="AuthenticationMethod"
remove-action="removeAction" remove-action="removeAction"
></users-datatable> ></users-datatable>
</div> </div>

4
app/directives/ui/datatables/users-datatable/usersDatatable.html
View File

@ -70,8 +70,8 @@
</span> </span>
</td> </td>
<td> <td>
<span ng-if="item.Id === 1 || authenticationMethod !== 2">Internal</span> <span ng-if="item.Id === 1 || $ctrl.authenticationMethod !== 2">Internal</span>
<span ng-if="item.Id !== 1 && authenticationMethod === 2">LDAP</span> <span ng-if="item.Id !== 1 && $ctrl.authenticationMethod === 2">LDAP</span>
</td> </td>
</tr> </tr>
<tr ng-if="!$ctrl.dataset"> <tr ng-if="!$ctrl.dataset">

3
app/directives/ui/datatables/users-datatable/usersDatatable.js
View File

@ -9,6 +9,7 @@ angular.module('ui').component('usersDatatable', {
orderBy: '@', orderBy: '@',
reverseOrder: '<', reverseOrder: '<',
showTextFilter: '<', showTextFilter: '<',
removeAction: '<' removeAction: '<',
authenticationMethod: '<'
} }
}); });