diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-24 14:34:31 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-24 15:01:27 -0400 |
| commit | f57e82d8c734e59977c39bc6a0139174cb7f0649 (patch) | |
| tree | a13cad24453a699a572ee8381da6de95b1ca428a /ecomp-portal-FE-common | |
| parent | 978dbcf0a196acbafad72fe1e2478ec0e384f02f (diff) | |
Repair DDL duplicate-index name issue
This blocked the portal-db container from starting, which blocked
the app servers from starting.
Issue: PORTAL-80
Change-Id: I4c0b6b378bda29355111b137cae32c8f219d9921
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-FE-common')
| -rw-r--r-- | ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html | 2 | ||||
| -rw-r--r-- | ecomp-portal-FE-common/client/app/views/role/role-list-controller.js | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html index d3c10441..996f2275 100644 --- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html @@ -60,7 +60,7 @@ <ul> <li gridster-item="item" ng-repeat="item in appCatalog" ng-if="(item.select && radioValue=='Selected') || (item.access && radioValue=='Accessible') || (radioValue == 'All')"> - <div class="gridster-box" style="{{!item.access?' color:lightgray !important':''}}"> + <div class="gridster-box" ng-attr-style="{{!item.access?' color:lightgray !important':''}}"> <div class="gridster-box-header" ng-show="(item.select && radioValue=='Selected') || (item.access && radioValue=='Accessible') || (radioValue == 'All')"> <i id="gridster-{{item.headerText.split(' ').join('-')}}-icon" class="icon-content-gridguide"></i> diff --git a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js index 582706c5..2ca149cb 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js @@ -42,7 +42,12 @@ app.controller('roleListController', function ($scope,RoleService,confirmBoxServ } else { toggleType = "inactivate"; } - + if((availableRole.id == "1") || (availableRole.id =="999")) + { + confirmBoxService.showInformation(availableRole.name+" role cannot be disabled"); + availableRole.active=!availableRole.active + return; + } confirmBoxService.confirm("You are about to "+toggleType+" the role "+availableRole.name+". Do you want to continue?").then( function(confirmed){ |