libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #1321 from girirajsharma/master

Browse source 
[KEYCLOAK-1356] Order the roles in a alphabetical way
This commit is contained in:
Stian Thorgersen 2015-06-03 11:00:57 +01:00
commit fb60ca115f
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-default-roles.html
View file

@ -17,7 +17,7 @@
<select id="available" class="form-control" multiple size="5" <select id="available" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmRoles" ng-model="selectedRealmRoles"
ng-options="r for r in availableRealmRoles"> ng-options="r for r in availableRealmRoles | orderBy:'toString()'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="addRealmDefaultRole()" tooltip="Assign role" tooltip-placement="right"> <button class="btn btn-default" type="submit" ng-click="addRealmDefaultRole()" tooltip="Assign role" tooltip-placement="right">
Add selected <i class="fa fa-angle-double-right"></i> Add selected <i class="fa fa-angle-double-right"></i>
@ -29,7 +29,7 @@
<select id="assigned" class="form-control" multiple size=5 <select id="assigned" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmDefRoles" ng-model="selectedRealmDefRoles"
ng-options="r for r in realm.defaultRoles"> ng-options="r for r in realm.defaultRoles | orderBy:'toString()'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="deleteRealmDefaultRole()" tooltip="Unassign role" tooltip-placement="left"> <button class="btn btn-default" type="submit" ng-click="deleteRealmDefaultRole()" tooltip="Unassign role" tooltip-placement="left">
<i class="fa fa-angle-double-left"></i> Remove selected <i class="fa fa-angle-double-left"></i> Remove selected
@ -55,7 +55,7 @@
<select id="available-client" class="form-control" multiple size="5" <select id="available-client" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedClientRoles" ng-model="selectedClientRoles"
ng-options="r for r in availableClientRoles"> ng-options="r for r in availableClientRoles | orderBy:'toString()'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="addClientDefaultRole()" tooltip="Assign role" tooltip-placement="right"> <button class="btn btn-default" type="submit" ng-click="addClientDefaultRole()" tooltip="Assign role" tooltip-placement="right">
Add selected <i class="fa fa-angle-double-right"></i> Add selected <i class="fa fa-angle-double-right"></i>
@ -67,7 +67,7 @@
<select id="assigned-client" class="form-control" multiple size=5 <select id="assigned-client" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedClientDefRoles" ng-model="selectedClientDefRoles"
ng-options="r for r in client.defaultRoles"> ng-options="r for r in client.defaultRoles | orderBy:'toString()'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="rmClientDefaultRole()" tooltip="Unassign role" tooltip-placement="left"> <button class="btn btn-default" type="submit" ng-click="rmClientDefaultRole()" tooltip="Unassign role" tooltip-placement="left">
<i class="fa fa-angle-double-left"></i> Remove selected <i class="fa fa-angle-double-left"></i> Remove selected

8
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html
View file

@ -64,7 +64,7 @@
<select id="available" class="form-control" multiple size="5" <select id="available" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmRoles" ng-model="selectedRealmRoles"
ng-options="r.name for r in realmRoles"> ng-options="r.name for r in realmRoles | orderBy:'name'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="addRealmRole()" tooltip="Associate role" tooltip-placement="right"> <button class="btn btn-default" type="submit" ng-click="addRealmRole()" tooltip="Associate role" tooltip-placement="right">
Add selected <i class="fa fa-angle-double-right"></i> Add selected <i class="fa fa-angle-double-right"></i>
@ -76,7 +76,7 @@
<select id="assigned" class="form-control" multiple size=5 <select id="assigned" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedRealmMappings" ng-model="selectedRealmMappings"
ng-options="r.name for r in realmMappings"> ng-options="r.name for r in realmMappings | orderBy:'name'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="deleteRealmRole()" tooltip="Disassociate role" tooltip-placement="left"> <button class="btn btn-default" type="submit" ng-click="deleteRealmRole()" tooltip="Disassociate role" tooltip-placement="left">
<i class="fa fa-angle-double-left"></i> Remove selected <i class="fa fa-angle-double-left"></i> Remove selected
@ -103,7 +103,7 @@
<select id="available-client" class="form-control" multiple size="5" <select id="available-client" class="form-control" multiple size="5"
ng-multiple="true" ng-multiple="true"
ng-model="selectedClientRoles" ng-model="selectedClientRoles"
ng-options="r.name for r in clientRoles"> ng-options="r.name for r in clientRoles | orderBy:'name'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="addClientRole()" tooltip="Associate role" tooltip-placement="right"> <button class="btn btn-default" type="submit" ng-click="addClientRole()" tooltip="Associate role" tooltip-placement="right">
Add selected <i class="fa fa-angle-right"></i> Add selected <i class="fa fa-angle-right"></i>
@ -115,7 +115,7 @@
<select id="assigned-client" class="form-control" multiple size=5 <select id="assigned-client" class="form-control" multiple size=5
ng-multiple="true" ng-multiple="true"
ng-model="selectedClientMappings" ng-model="selectedClientMappings"
ng-options="r.name for r in clientMappings"> ng-options="r.name for r in clientMappings | orderBy:'name'">
</select> </select>
<button class="btn btn-default" type="submit" ng-click="deleteClientRole()" tooltip="Disassociate role" tooltip-placement="left"> <button class="btn btn-default" type="submit" ng-click="deleteClientRole()" tooltip="Disassociate role" tooltip-placement="left">
<i class="fa fa-angle-left"></i> Remove selected <i class="fa fa-angle-left"></i> Remove selected

2
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html
View file

@ -33,7 +33,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="role in roles | filter:{name: searchQuery}"> <tr ng-repeat="role in roles | orderBy:'name' | filter:{name: searchQuery}">
<td><a href="#/realms/{{realm.realm}}/roles/{{role.id}}">{{role.name}}</a></td> <td><a href="#/realms/{{realm.realm}}/roles/{{role.id}}">{{role.name}}</a></td>
<td>{{role.composite}}</td> <td>{{role.composite}}</td>
<td>{{role.description}}</td> <td>{{role.description}}</td>