diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin')
3 files changed, 15 insertions, 15 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html index 62f05269..8a944d76 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html @@ -1,5 +1,5 @@ <div> - <div class="modal-header ng-scope in"> + <div class="b2b-modal-header ng-scope in"> <h1><i class="icon-primary-alert"></i></h1> <h2 id="myModalLabel" modal-title="">Confirm</h2> <div class="corner-button in"> @@ -7,17 +7,17 @@ ng-click="$dismiss('cancel')"></button> </div> </div> - <div class="modal-body ng-scope ng-isolate-scope in" tabindex="0" + <div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0" role="region" aria-label="Modal header text content" style="height: 55px;"> - You are about to add the role function {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue? + You are about to add the child role {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue? </div> - <div class="modal-footer ng-scope ng-isolate-scope in"> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> <div class="cta-button-group in"> <button ng-if="!msg.selected" class="btn btn-alt btn-medium" type="button" - ng-click="confirmRoleChildRemove(msg.selected,msg.availableRole,msg.roleId);">Yes</button> + ng-click="confirmRoleChildRemove(msg.selected,msg.availableRole,msg.availableRole.id);">Yes</button> <button ng-if="msg.selected" class="btn btn-alt btn-medium" type="button" - ng-click="confirmRoleChildAdd(msg.selected,msg.availableRole,msg.roleId);">Yes</button> + ng-click="confirmRoleChildAdd(msg.selected,msg.availableRole,msg.availableRole.id);">Yes</button> <button class="btn btn-clear btn-medium" type="button" ng-click="$dismiss('cancel')">Cancel</button> </div> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html index 94211773..ec8b2b8e 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html @@ -12,15 +12,14 @@ <th>Role</th> </tr> </thead> - <tbody type="body" ng-repeat="role in role.childRoles"> + <tbody type="body" ng-repeat="role in msg.roleChildFunctions"> <tr> <td> - <label ng-click="activateRoleChildConfirmPopUp(roleFunction.selected,roleFunction);" class="btn-switch-label" tabindex="0" role="option"> - <input type="checkbox" ddh-switches ng-model="roleFunction.selected" - size-class="modal-small modal-alert" > - </label> + <label class="btn-switch-label" tabindex="0" role="option"> + <input ng-click="activateRoleChildConfirmPopUp(role.active, role);" type="checkbox" b2b-switches ng-model="role.active" size-class="modal-small modal-alert"> + </label> </td> - <td>{{ roleFunction.name }}</td> + <td>{{ role.name }}</td> </tr> </tbody> </table> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html index 12d8df70..e2aa188a 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html @@ -49,9 +49,10 @@ </div> <br/> - <div> + <!-- Commented code due to issues with child role activation and deactivation, should be revisited --> + <!-- <div> <h4 class="heading-small-emphasis">Child Roles</h4> - <button class="btn btn-alt btn-small" ng-click="addNewChildRoleFunctionModalPopup(role.roleFunctions,role.name, role);">Manage Child Roles</button> + <button class="btn btn-alt btn-small" ng-click="addNewChildRoleFunctionModalPopup(role.childRoles,role.name, role);">Manage Child Roles</button> <table class="striped" ng-if="role.childRoles.length"> <thead> @@ -69,7 +70,7 @@ </tr> </tbody> </table> - </div> + </div> --> <br/> <div> <a href="admin#/role_function_list">Manage Role Functions</a><br><br> |