Merge pull request #476 from jembi/OHM-625-helper-hover

Changed unsafe html to html string
jembi · Jan 15, 2018 · 13bf2c4 · 13bf2c4
2 parents b57ef0f + 04bae34
commit 13bf2c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/scripts/controllers/usersmodal.js b/app/scripts/controllers/usersmodal.js
@@ -1,12 +1,13 @@
 import { getHashAndSalt, isValidMSISDN } from '../utils'
 
-export function UsersModalCtrl ($http, $scope, $uibModalInstance, $timeout, Api, login, Notify, Alerting, user) {
+export function UsersModalCtrl ($http, $scope, $uibModalInstance, $sce, $timeout, Api, login, Notify, Alerting, user) {
   /*************************************************************/
   /**   These are the functions for the User initial load     **/
   /*************************************************************/
 
   // default - update is false
   $scope.update = false
+  $scope.phoneNumberTooltip = $sce.trustAsHtml('Accepted format: <br />27123456789 <br />( 5 - 15 digits )')
 
   // object for the taglist roles
   $scope.taglistUserRoleOptions = []

diff --git a/app/views/usersmodal.html b/app/views/usersmodal.html
@@ -38,7 +38,7 @@ <h4 class="modal-title" id="addUserLabel">
       <div class="form-group" ng-class="{ 'has-error' : ngError.msisdn }">
         <label>
           Phone number (MSISDN format)
-          <i ng-show="uiSettings.showTooltips" tooltip-placement="top" tooltip-html-unsafe="Accepted format: <br />27123456789 <br />( 5 - 15 digits )" class="glyphicon glyphicon-question-sign tooltip-wide"></i>
+          <i ng-show="uiSettings.showTooltips" tooltip-placement="top" uib-tooltip-html="phoneNumberTooltip" class="glyphicon glyphicon-question-sign tooltip-wide"></i>
         </label>
         <input class="form-control" type="text" ng-model="user.msisdn" />
         <div class="has-error-msg"><i class="glyphicon glyphicon-warning-sign"></i>MSISDN is not in the accepeted format: 27123456789 ( 5 - 15 digits )</div>