Merge "Fix sql injection vulnerability"

[portal.git] / ecomp-portal-FE-common / client / app / views / users / new-user-dialogs / new-user.modal.html

diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
index b36e859..dc93006 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
+++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html
@@ -1,21 +1,39 @@
 <!--
-  ================================================================================
-  ECOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
+ 
+              http://www.apache.org/licenses/LICENSE-2.0
+ 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  ================================================================================
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ 
+  ============LICENSE_END============================================
+ 
+  
   -->
 <style>
        .title {
@@ -37,22 +55,44 @@
 
                <div class="b2b-modal-header">
                        <h2 class="heading-medium" id="newAdmin">New User</h2>
-
+                       
                        <div class="corner-button in">
                                <button type="button" class="close" aria-label="Close" id="user-button-close" 
                                        ng-click="$dismiss('cancel')"></button>
                        </div>
                </div>
-
-               <div class="b2b-modal-body" tabindex="0"
+                               
+                               <fieldset style="height: 75px;" role="radiogroup"
+                                               b2b-radio-group-accessibility aria-labelledby="radiolabel2">
+                                               <div class="form-row" role="radio"
+                                                       ng-repeat="radioObj in ngRepeatDemo">
+                                                       <label style="margin-top: 10px;" for="{{radioObj.id}}"
+                                                               class="radio"> <input type="radio"
+                                                               ng-model="selectedvalueradioButtonGroup.type"
+                                                               id="{{radioObj.id}}"
+                                                               name="nameradioButton" value="{{radioObj.value}}"> <i
+                                                               style= "margin-top: 10px; margin-left: 38px;" class="skin"></i> <span
+                                                               style="margin-top: 10px; margin-left: 70px;">{{radioObj.labelvalue}}</span>
+                                                       </label>
+                                               </div>
+                                       </fieldset>
+                 <div class="systemUser" ng-show="selectedvalueradioButtonGroup.type =='false'" style="color: #5a5a5a;
+        font-family: Omnes-ECOMP-W02, Arial;font-size: 14px;margin-bottom: 8px; padding-left: 30px;">Enter system UserId</div>
+          <div ng-show="selectedvalueradioButtonGroup.type =='false'">
+                               <input id="action-property-input"
+                                       class="adminForm-name-property-input" placeholder="xxxxxx@org.com"
+                                       ng-model="newUser.selectedUser.orgUserId"
+                                       type="text" maxlength="60" style="padding: 20px;
+                  margin-left: 30px; width: 60%;"/>
+                       </div>
+               <div class="b2b-modal-body" tabindex="0" ng-show="selectedvalueradioButtonGroup.type =='true'"
                        aria-label="Modal header text content" role="region">
                        <search-users search-title="" selected-user="newUser.selectedUser"></search-users>
-               </div>
-
+               </div>          
                <div class="b2b-modal-footer">
                        <div class="cta-button-group in">
                                <button class="btn btn-alt btn-small" id="next-button"  ng-click="newUser.selectedUser && newUser.getUserAppsRoles()"
-                        ng-class="{disabled: !newUser.selectedUser}">Next
+                        ng-disabled = "(!newUser.selectedUser && selectedvalueradioButtonGroup.type =='true' ) || (selectedvalueradioButtonGroup.type =='false' && !newUser.selectedUser) ||(newUser.selectedUser && newUser.selectedUser.orgUserId.length <1)">Next
                        </button>
                                <button id="search-users-button-cancel"
                                        class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button>
@@ -60,7 +100,7 @@
                </div>
 
        </div>
-               <div ng-if="newUser.dialogState===3">
+               <div ng-if="newUser.dialogState===3" >
        
                        <div class="b2b-modal-header">
                                <div class="title"