Changes in Users page

Issue-ID: PORTAL-256

Fix on Users page modal

Change-Id: I44427259c0a6caa9623a884e5127e16de86cff8d
Signed-off-by: Hima Elisetty <hbindu@research.att.com>

diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md
index f2a960b..04e60b0 100644 (file)
--- a/ecomp-portal-BE-os/README.md
+++ b/ecomp-portal-BE-os/README.md
@@ -40,6 +40,7 @@ Version 2.2
 - [Portal-155] Review security issues: portal
 - [Portal-202] Remove files that have GPL or other license issues      - b2b-library.min.js
 - [Portal-241] To reteieve roles on Users page for sdk(external app)
+- [Portal-256] Fix to make the userRole dynamic on Users modal popup
 
 Version 1.1.0 (Amsterdam), November 2017
 - [Portal-6] Updates to License and Trademark in the PORTAL Source Code

diff --git a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.directive.js b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.directive.js
index c9e5d17..8ce8ec2 100644 (file)
--- a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.directive.js
+++ b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.directive.js
@@ -126,6 +126,24 @@ angular.module('ecompApp')
                     }
                     return disp;
                 };
+                
+                scope.getIdTitle = function(){
+                    var disp = '';
+                    if(!scope.ngModel || !scope.ngModel.length) {
+                        return disp;
+                    }
+                    scope.ngModel.forEach(function(item){
+                        if(item[scope.valueAttr]){
+                            disp+=item[scope.nameAttr] + ',';
+                        }
+                    });
+                    if(disp!==''){
+                        disp = disp.slice(0,disp.length-1);
+                    }else{
+                        disp = scope.placeholder;
+                    }
+                    return disp+attrs.uniqueData;
+                };
             }
         };
     });

diff --git a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html
index 2db7590..a6a8052 100644 (file)
--- a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html
+++ b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html
@@ -37,7 +37,7 @@
   -->
 <div id="app-multilple-select" class="multiple-select">
     <div class="selectBox"
-        id="app-select-{{getTitle()}}"
+        id="app-select-{{getIdTitle()}}"
          ng-click="isDisabled || showCheckboxes()"
          title="{{getTitle()}}"
          ng-bind="getTitle()"