community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #846 from DimalChandrasiri/master

Browse Source 
fixes wso2/product-iots#1141
This commit is contained in:
Madhawa Perera 2017-07-14 11:40:21 +05:30 committed by GitHub
commit e73eef9490
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
View File

@ -41,7 +41,9 @@
<hr/> <hr/>
<div class="form-login-box" > <div class="form-login-box" >
<label class="wr-input-label">Group Name</label> <label class="wr-input-label" title="{{groupNameHelpMsg}}">Group Name
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</label>
<div class="form-group wr-input-control"> <div class="form-group wr-input-control">
<input type="text right" id="name" placeholder="Group Name" data-regex="{{groupNameJSRegEx}}" <input type="text right" id="name" placeholder="Group Name" data-regex="{{groupNameJSRegEx}}"

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
View File

@ -232,6 +232,9 @@ function loadGroups() {
$.each($('td', row), function (colIndex) { $.each($('td', row), function (colIndex) {
switch (colIndex) { switch (colIndex) {
case 1: case 1:
//TODO : The following line encodes html entities.
//Should check for a better solution since it only changes the presentation layer
$(this).text($("<textarea></textarea>").html(this.innerText).text())
$(this).attr('data-grid-label', "Name"); $(this).attr('data-grid-label', "Name");
$(this).attr('data-search', data.name); $(this).attr('data-search', data.name);
$(this).attr('data-display', data.name); $(this).attr('data-display', data.name);