From 6e1e801ea056a3e82a29305f2537ceae1ecd9d8c Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Sat, 14 Jan 2017 23:50:34 +0530
Subject: [PATCH 01/13] Fix for multiple popup issue

---
 .../app/units/cdmf.unit.lib.qrcode/qrcode.hbs |  7 -----
 .../cdmf.unit.ui.modal/public/js/modal.js     | 26 +++++++++++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
index d63ee90965..07ee1b4801 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
@@ -67,11 +67,4 @@
             });
         }
     </script>
-    <script type="text/javascript">
-        function toggleEnrollment(){
-            $(".modal-content").html($("#qr-code-modal").html());
-            generateQRCode(".modal-content .qr-code");
-            showQRCodePopup();
-        }
-    </script>
 {{/zone}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js
index 0e97b964b7..29c29bf7a8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/public/js/modal.js
@@ -20,15 +20,15 @@
 var modalDialog = (function () {
     var publicMethoads = {};
     publicMethoads.header = function (headerText) {
-        $("#modal-title-text").html(headerText);
+        $("#basic-modal-view #modal-title-text").html(headerText);
 
     };
     publicMethoads.content = function (contentText) {
-        $("#modal-content-text").html(contentText);
+        $("#basic-modal-view #modal-content-text").html(contentText);
 
     };
     publicMethoads.footer = function (footerContent) {
-        $("#modal-footer-content").html(footerContent);
+        $("#basic-modal-view #modal-footer-content").html(footerContent);
 
     };
     publicMethoads.footerButtons = function (buttonList) {
@@ -37,7 +37,7 @@ var modalDialog = (function () {
             footerContent = footerContent + '<div class="buttons"><a href="#" id="' + btn.id +
                 '" class="btn-operations">' + btn.text + '</a></div>';
         }
-        $("#modal-footer-content").html(footerContent);
+        $("#basic-modal-view #modal-footer-content").html(footerContent);
     };
     publicMethoads.show = function () {
 
@@ -62,11 +62,21 @@ var modalDialog = (function () {
     publicMethoads.hide = function () {
         $("#basic-modal-view").addClass('hidden');
         $("#basic-modal-view").modal('hide');
-        $("#modal-title-text").html("");
-        $("#modal-content-text").html("");
-        $("#modal-footer-content").html("");
-        $('body').removeClass('modal-open').css('padding-right', '0px');
         $('.modal-backdrop').remove();
     };
+
+    $("#basic-modal-view").on('hidden.bs.modal', function () {
+        $('#basic-modal-view .modal-dialog').html('<div class="modal-content"><div class="modal-header">' +
+            '<h3 class="pull-left modal-title"><span class="fw-stack error-msg-icon hidden">' +
+            '<i class="fw fw-circle-outline fw-stack-2x"></i><i class="fw fw-error fw-stack-1x"></i></span>' +
+            '<span class="fw-stack warning-msg-icon hidden"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
+            '<i class="fw fw-warning fw-stack-1x"></i></span><span id="modal-title-text"></span></h3>' +
+            '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>' +
+            '</button></div><div class="modal-body add-margin-top-2x add-margin-bottom-2x">' +
+            '<div id="modal-content-text"></div></div>' +
+            '<div class="modal-footer" id="modal-footer-content"></div></div>');
+        $('body').removeClass('modal-open').css('padding-right', '0px');
+    });
+
     return publicMethoads;
 }(modalDialog));
\ No newline at end of file

From 34aac480714167f1b84b19ee18798ccc707defbe Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Tue, 17 Jan 2017 15:09:40 +0530
Subject: [PATCH 02/13] Notification bar scroll and trigger issue fix

---
 .../cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs |  11 +-
 .../public/js/nav-menu.js                     | 226 +++++++++++++-----
 .../public/css/custom-desktop.css             |  11 +-
 3 files changed, 177 insertions(+), 71 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
index 21687eef22..16ff0e7239 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -80,9 +80,9 @@
             <!--<a href="{{@app.context}}notification-listing" title="Failures of operations on the device side will be listed here">-->
             <a data-toggle="sidebar" data-target="#right-sidebar" data-container=".page-content"
                aria-expanded="false" rel="notifications-sidebar">
-                                <span class="icon fw-stack">
-                                    <i class="fw fw-notification fw-stack-1x"></i>
-                                </span>
+                <span class="icon fw-stack">
+                    <i class="fw fw-notification fw-stack-1x"></i>
+                </span>
                 <span class="hidden-xs">Notifications</span>
                 <span class="badge notifications" id="notification-bubble"></span>
             </a>
@@ -90,9 +90,8 @@
     </ul>
 {{/zone}}
 {{#zone "sidePanes"}}
-    <div class="sidebar-wrapper" id="right-sidebar" is-authorized="{{isAuthorizedForNotifications}}"
-         data-side="right" data-width="320" data-sidebar-fixed="true" data-fixed-offset="50" data-spy="affix"
-         data-offset-top="80">
+        <div class="sidebar-wrapper sidebar-wrapper-animation-fix" id="right-sidebar" is-authorized="{{isAuthorizedForNotifications}}"
+         data-side="right" data-width="320" data-sidebar-fixed="true" data-top="90" data-fixed-offset="90" data-offset-top="50" data-spy="affix">
         <ul class="sidebar-messages">
         </ul>
         <div class="text-center"><a href="{{@app.context}}/notification-listing" class="btn btn-primary">Show All Notifications</a></div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
index e94a5500a6..2b7d3cf2d4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
@@ -128,15 +128,16 @@ function loadNewNotifications() {
 }
 
 /**
- * Toggle function for
- * notification listing sidebar.
+ * Sidebar function
  * @return {Null}
  */
-$.sidebar_toggle = function (action, target, container) {
+$.sidebar_toggle = function(action, target, container) {
     var elem = '[data-toggle=sidebar]',
         button,
-        containerOffsetLeft,
-        containerOffsetRight,
+        container,
+        conrainerOffsetLeft,
+        conrainerOffsetRight,
+        target,
         targetOffsetLeft,
         targetOffsetRight,
         targetWidth,
@@ -145,104 +146,177 @@ $.sidebar_toggle = function (action, target, container) {
         pushType,
         buttonParent;
 
+    /**
+     * Dynamically adjust the height of sidebar to fill parent
+     */
+    function sidebarHeightAdjust(){
+        $('.sidebar-wrapper').each(function(){
+            var elemOffsetBottom = $(this).data('offset-bottom'),
+                scrollBottom = ($(document).height() - $(window).height()),
+                offesetBottom = 0,
+                getBottomOffset = elemOffsetBottom - (scrollBottom - ($(window).scrollTop()-elemOffsetBottom) - elemOffsetBottom);
+
+            if(getBottomOffset > 0){
+                offesetBottom = getBottomOffset;
+            }
+
+            $(this).height(($(window).height() - ($(this).offset().top - $(window).scrollTop())) - offesetBottom);
+
+            if((typeof $.fn.nanoScroller == 'function') && ($('.nano-content', this).length > 0)){
+                $(".nano-content").parent()[0].nanoscroller.reset();
+            }
+        });
+    };
+
     var sidebar_window = {
-        update: function (target, container, button) {
-            containerOffsetLeft = $(container).data('offset-left') ? $(container).data('offset-left') : 0;
-            containerOffsetRight = $(container).data('offset-right') ? $(container).data('offset-right') : 0;
-            targetOffsetLeft = $(target).data('offset-left') ? $(target).data('offset-left') : 0;
-            targetOffsetRight = $(target).data('offset-right') ? $(target).data('offset-right') : 0;
-            targetWidth = $(target).data('width');
-            targetSide = $(target).data("side");
-            pushType = $(container).parent().is('body') == true ? 'padding' : 'margin';
-
-            if (button !== undefined) {
+        update: function(target, container, button){
+            conrainerOffsetLeft = $(container).data('offset-left') ? $(container).data('offset-left') : 0,
+                conrainerOffsetRight = $(container).data('offset-right') ? $(container).data('offset-right') : 0,
+                targetTop = $(target).data('top') ? $(target).data('top') : 0,
+                targetOffsetLeft = $(target).data('offset-left') ? $(target).data('offset-left') : 0,
+                targetOffsetRight = $(target).data('offset-right') ? $(target).data('offset-right') : 0,
+                targetWidth = $(target).data('width'),
+                targetSide = $(target).data("side"),
+                pushType = $(container).parent().is('body') == true ? 'padding' : 'padding'; //TODO: Remove if works everywhere
+
+            $(container).addClass('sidebar-target');
+
+            if(button !== undefined){
                 relationship = button.attr('rel') ? button.attr('rel') : '';
                 buttonParent = $(button).parent();
             }
-        },
 
-        show: function () {
-            if ($(target).data('sidebar-fixed') == true) {
+            $(target).css('top', targetTop);
+
+            sidebarHeightAdjust();
+        },
+        show: function(){
+            if($(target).data('sidebar-fixed') == true) {
+                $(target).css('top',$(target).data('fixed-offset') + 'px');
                 $(target).height($(window).height() - $(target).data('fixed-offset'));
             }
+
+            $(target).off('webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend');
             $(target).trigger('show.sidebar');
-            if (targetWidth !== undefined) {
+
+            if(targetWidth !== undefined) {
                 $(target).css('width', targetWidth);
             }
+
             $(target).addClass('toggled');
-            if (button !== undefined) {
-                if (relationship !== '') {
+
+            if(button !== undefined){
+                if(relationship !== ''){
                     // Removing active class from all relative buttons
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').removeClass("active");
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').attr('aria-expanded', 'false');
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').removeClass("active");
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').attr('aria-expanded', 'false');
                 }
+
                 // Adding active class to button
-                if (button.attr('data-handle') !== 'close') {
+                if(button.attr('data-handle') !== 'close'){
                     button.addClass("active");
                     button.attr('aria-expanded', 'true');
                 }
-                if (buttonParent.is('li')) {
-                    if (relationship !== '') {
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().removeClass("active");
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().
-                        attr('aria-expanded', 'false');
+
+                if(buttonParent.is('li')) {
+                    if(relationship !== ''){
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().removeClass("active");
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().attr('aria-expanded', 'false');
                     }
                     buttonParent.addClass("active");
                     buttonParent.attr('aria-expanded', 'true');
                 }
             }
+
             // Sidebar open function
-            if (targetSide == 'left') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetWidth + targetOffsetLeft);
+            if (targetSide == 'left'){
+                if ($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetWidth + targetOffsetLeft);
+                    $(target).css(targetSide, targetOffsetLeft);
                 }
-                $(target).css(targetSide, targetOffsetLeft);
-            } else if (targetSide == 'right') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetWidth + targetOffsetRight);
+                else if ($(target).attr('data-container-push')){
+                    $(container).css(targetSide,  Math.abs(targetWidth + targetOffsetLeft));
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
+                }
+                else {
+                    $(target).css(targetSide, Math.abs(targetOffsetLeft));
+                }
+            }
+            else if (targetSide == 'right'){
+                if ($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetWidth + targetOffsetRight);
+                    $(target).css(targetSide, targetOffsetRight);
+                }
+                else if ($(target).attr('data-container-push')){
+                    $(container).css(targetSide, Math.abs(targetWidth + targetOffsetRight));
+                    $(target).css(targetSide,  -Math.abs(targetWidth + targetOffsetRight));
+                }
+                else {
+                    $(target).css(targetSide, Math.abs(targetOffsetRight));
                 }
-                $(target).css(targetSide, targetOffsetRight);
             }
+
             $(target).trigger('shown.sidebar');
         },
-
-        hide: function () {
+        hide: function(){
             $(target).trigger('hide.sidebar');
             $(target).removeClass('toggled');
-            if (button !== undefined) {
-                if (relationship !== '') {
+
+            if(button !== undefined){
+                if(relationship !== ''){
                     // Removing active class from all relative buttons
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').removeClass("active");
-                    $(elem + '[rel=' + relationship + ']:not([data-handle=close])').attr('aria-expanded', 'false');
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').removeClass("active");
+                    $(elem+'[rel='+relationship+']:not([data-handle=close])').attr('aria-expanded', 'false');
                 }
                 // Removing active class from button
-                if (button.attr('data-handle') !== 'close') {
+                if(button.attr('data-handle') !== 'close'){
                     button.removeClass("active");
                     button.attr('aria-expanded', 'false');
                 }
-                if ($(button).parent().is('li')) {
-                    if (relationship !== '') {
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().removeClass("active");
-                        $(elem + '[rel=' + relationship + ']:not([data-handle=close])').parent().
-                        attr('aria-expanded', 'false');
+
+                if($(button).parent().is('li')){
+                    if(relationship !== ''){
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().removeClass("active");
+                        $(elem+'[rel='+relationship+']:not([data-handle=close])').parent().attr('aria-expanded', 'false');
                     }
                 }
             }
+
             // Sidebar close function
-            if (targetSide == 'left') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetOffsetLeft);
+            if (targetSide == 'left'){
+                if($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetOffsetLeft);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
                 }
-                $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
-            } else if (targetSide == 'right') {
-                if ((button !== undefined) && (button.attr('data-container-divide'))) {
-                    $(container).css(pushType + '-' + targetSide, targetOffsetRight);
+                else if($(target).attr('data-container-push')){
+                    $(container).css(targetSide, targetOffsetLeft);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
+                }
+                else {
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetLeft));
                 }
-                $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
             }
+            else if (targetSide == 'right'){
+                if($(target).attr('data-container-divide')){
+                    $(container).css(pushType+'-'+targetSide, targetOffsetRight);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
+                }
+                else if($(target).attr('data-container-push')){
+                    $(container).css(targetSide, targetOffsetRight);
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
+                }
+                else {
+                    $(target).css(targetSide, -Math.abs(targetWidth + targetOffsetRight));
+                }
+            }
+
             $(target).trigger('hidden.sidebar');
+            $(target).on('webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend', function(e) {
+                $(container).removeClass('sidebar-target');
+            });
         }
     };
+
     if (action === 'show') {
         sidebar_window.update(target, container);
         sidebar_window.show();
@@ -251,27 +325,52 @@ $.sidebar_toggle = function (action, target, container) {
         sidebar_window.update(target, container);
         sidebar_window.hide();
     }
+
     // binding click function
-    var body = 'body';
-    $(body).off('click', elem);
-    $(body).on('click', elem, function (e) {
+    $('body').off('click', elem);
+    $('body').on('click', elem, function(e) {
         e.preventDefault();
+
         button = $(this);
-        container = button.data('container');
         target = button.data('target');
+        container = $(target).data('container');
         sidebar_window.update(target, container, button);
+
         /**
          * Sidebar function on data container divide
          * @return {Null}
          */
-        if (button.attr('aria-expanded') == 'false') {
+        if(button.attr('aria-expanded') == 'false'){
             sidebar_window.show();
-        } else if (button.attr('aria-expanded') == 'true') {
+        }
+        else if (button.attr('aria-expanded') == 'true') {
             sidebar_window.hide();
         }
+
     });
+
+    $(window)
+        .load(sidebarHeightAdjust)
+        .resize(sidebarHeightAdjust)
+        .scroll(sidebarHeightAdjust);
+
 };
 
+var sideWrapper = $('.sidebar-wrapper');
+
+$(document).on('affix.bs.affix','.sidebar-wrapper',function(){
+    sideWrapper.css('top',$('.navbar-wrapper').height());
+    sideWrapper.data('top',$('.navbar-wrapper').height());
+    sideWrapper.data('fixed-offset', $('.navbar-wrapper').height());
+});
+
+$(document).on('affix-top.bs.affix','.sidebar-wrapper',function(){
+    sideWrapper.css('top',$('.navbar-wrapper').height() + $('.header').height());
+    sideWrapper.data('top',$('.navbar-wrapper').height() + $('.header').height());
+    sideWrapper.data('fixed-offset', $('.navbar-wrapper').height() + $('.header').height());
+});
+
+
 $.fn.collapse_nav_sub = function () {
     var navSelector = 'ul.nav';
 
@@ -324,7 +423,6 @@ $.fn.collapse_nav_sub = function () {
 
 $(document).ready(function () {
     loadNotificationsPanel();
-    $.sidebar_toggle();
 
     $("#right-sidebar").on("click", ".new-notification", function () {
         var notificationId = $(this).data("id");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index a84549d307..2dad66764f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -804,7 +804,7 @@ header .dropdown[aria-expanded=true], header .dropdown:hover {
 .navbar .container-fluid > .navbar-header .icon,
 .navbar .container > .navbar-collapse .icon,
 .navbar .container > .navbar-header .icon {
-  margin-bottom: 4px;
+  margin-bottom: 0px !important;
 }
 
 .navbar-nav {
@@ -1108,6 +1108,14 @@ header .dropdown[aria-expanded=true], header .dropdown:hover {
   right: 0;
 }
 
+.sidebar-wrapper-animation-fix{
+  -webkit-transition: left 0.5s ease, right 0.5s ease !important;
+  -moz-transition: left 0.5s ease, right 0.5s ease !important;
+  -ms-transition: left 0.5s ease, right 0.5s ease !important;
+  -o-transition: left 0.5s ease, right 0.5s ease !important;
+  transition: left 0.5s ease, right 0.5s ease !important;
+}
+
 ul.sidebar-messages {
   padding: 0;
   margin: 0;
@@ -6393,6 +6401,7 @@ ul.tiles .icon {
      background: #f4f4f4;
      border:1px solid #ddd;
      margin-bottom:10px;
+     padding: 15px;
  }
  .media .list-group-item a, .media .list-group-item a{
      background:#f4f4f4;

From 2b466914052fe44b6ffa4f805d154430082cb2d7 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Tue, 17 Jan 2017 20:17:40 +0530
Subject: [PATCH 03/13] Fixing user menu not showing issue

---
 .../devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js
index 363d9688e6..471a152402 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.js
@@ -32,6 +32,7 @@ function onRequest(context) {
     var constants = require("/app/modules/constants.js");
     var uiPermissions = userModule.getUIPermissions();
     context["permissions"] = uiPermissions;
+    context["userMgtEnabled"] = (uiPermissions["LIST_USERS"] || uiPermissions["LIST_ROLES"]);
 
     var links = {
         "user-mgt": [],

From 5de2a233d7647d7efd04599514f61aeef75a213c Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Wed, 18 Jan 2017 00:16:18 +0530
Subject: [PATCH 04/13] Recomended security fixes for data tables

---
 .../cdmf.page.devices/public/js/listing.js    | 22 +++++++++++--------
 .../cdmf.page.groups/public/js/listing.js     | 12 ++++++----
 .../public/js/policy-list.js                  |  4 ++++
 .../cdmf.page.roles/public/js/role-listing.js |  8 +++++--
 .../cdmf.page.users/public/js/listing.js      | 14 +++++++-----
 .../public/js/listing.js                      | 16 ++++++++++----
 6 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
index bae88512d5..51c9d92625 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
@@ -375,15 +375,15 @@ function loadDevices(searchType, searchParam) {
 
     var fnCreatedRow = function (row, data, dataIndex) {
         $(row).attr('data-type', 'selectable');
-        $(row).attr('data-deviceid', data.deviceIdentifier);
-        $(row).attr('data-devicetype', data.deviceType);
-        $(row).attr('data-url', context + '/device/' + data.deviceType + '?id=' + data.deviceIdentifier);
-        var model = getPropertyValue(data.properties, 'DEVICE_MODEL');
-        var vendor = getPropertyValue(data.properties, 'VENDOR');
-        var owner = data.user;
-        var status = data.status;
-        var ownership = data.ownership;
-        var deviceType = data.deviceType;
+        $(row).attr('data-deviceid', htmlspecialchars(data.deviceIdentifier));
+        $(row).attr('data-devicetype', htmlspecialchars(data.deviceType));
+        $(row).attr('data-url', context + '/device/' + htmlspecialchars(data.deviceType) + '?id=' + htmlspecialchars(data.deviceIdentifier));
+        var model = htmlspecialchars(getPropertyValue(data.properties, 'DEVICE_MODEL'));
+        var vendor = htmlspecialchars(getPropertyValue(data.properties, 'VENDOR'));
+        var owner = htmlspecialchars(data.user);
+        var status = htmlspecialchars(data.status);
+        var ownership = htmlspecialchars(data.ownership);
+        var deviceType = htmlspecialchars(data.deviceType);
         var category = getDeviceTypeCategory(deviceType);
         $.each($('td', row), function (colIndex) {
             switch (colIndex) {
@@ -417,6 +417,10 @@ function loadDevices(searchType, searchParam) {
         });
     };
 
+    function htmlspecialchars(text){
+        return jQuery('<div/>').text(text).html();
+    }
+
     var dataFilter = function (data) {
         data = JSON.parse(data);
         var objects = [];
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
index 212bec7521..6566078bf9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
@@ -112,6 +112,10 @@ function toTitleCase(str) {
     });
 }
 
+function htmlspecialchars(text){
+    return jQuery('<div/>').text(text).html();
+}
+
 function loadGroups() {
     var groupListing = $("#group-listing");
     var currentUser = groupListing.data("currentUser");
@@ -134,10 +138,10 @@ function loadGroups() {
         var objects = [];
         $(data.deviceGroups).each(function (index) {
             objects.push({
-                             groupId: data.deviceGroups[index].id,
-                             name: data.deviceGroups[index].name,
-                             description: data.deviceGroups[index].description,
-                             owner: data.deviceGroups[index].owner
+                             groupId: htmlspecialchars(data.deviceGroups[index].id),
+                             name: htmlspecialchars(data.deviceGroups[index].name),
+                             description: htmlspecialchars(data.deviceGroups[index].description),
+                             owner: htmlspecialchars(data.deviceGroups[index].owner)
                          })
         });
         var json = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
index 8e31e39ecc..39742fd9dc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
@@ -109,6 +109,10 @@ function getSelectedPolicies() {
     return policyList;
 }
 
+function htmlspecialchars(text){
+    return jQuery('<div/>').text(text).html();
+}
+
 $(document).ready(function () {
 
     /**
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
index 5b5b835d5b..d673e72929 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
@@ -86,6 +86,10 @@ function InitiateViewOption() {
     // $(location).attr('href', $(this).data("url"));
 }
 
+function htmlspecialchars(text){
+    return jQuery('<div/>').text(text).html();
+}
+
 function loadRoles() {
     var loadingContent = $("#loading-content");
     loadingContent.show();
@@ -98,8 +102,8 @@ function loadRoles() {
         $(data.roles).each(function (index) {
             objects.push(
                 {
-                    name: data.roles[index],
-                    DT_RowId: "role-" + data.roles[index]
+                    name: htmlspecialchars(data.roles[index]),
+                    DT_RowId: "role-" + htmlspecialchars(data.roles[index])
                 }
             )
         });
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index 95c8b9bbc3..ce89b335f5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -258,6 +258,10 @@ function InitiateViewOption() {
     }
 }
 
+function htmlspecialchars(text){
+    return jQuery('<div/>').text(text).html();
+}
+
 function loadUsers() {
     var loadingContentView = "#loading-content";
     $(loadingContentView).show();
@@ -269,11 +273,11 @@ function loadUsers() {
 
         $(data.users).each(function (index) {
             objects.push({
-                filter: data.users[index].username,
-                firstname: data.users[index].firstname ? data.users[index].firstname : "",
-                lastname: data.users[index].lastname ? data.users[index].lastname : "",
-                emailAddress: data.users[index].emailAddress ? data.users[index].emailAddress : "",
-                DT_RowId: "user-" + data.users[index].username
+                filter: htmlspecialchars(data.users[index].username),
+                firstname: htmlspecialchars(data.users[index].firstname) ? htmlspecialchars(data.users[index].firstname) : "",
+                lastname: htmlspecialchars(data.users[index].lastname) ? htmlspecialchars(data.users[index].lastname) : "",
+                emailAddress: htmlspecialchars(data.users[index].emailAddress) ? htmlspecialchars(data.users[index].emailAddress) : "",
+                DT_RowId: "user-" + htmlspecialchars(data.users[index].username)
             })
         });
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
index ba9a4be94a..d841590be9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
@@ -122,6 +122,14 @@ function toTitleCase(str) {
 
 var deviceTypeCount, compiledDeviceTypesCount = 0;
 
+function htmlspecialchars(text){
+    return jQuery('<div/>').text(text).html();
+}
+
+function htmlspecialchars(text){
+    return jQuery('<div/>').text(text).html();
+}
+
 function loadDevices(searchType, searchParam){
     var deviceListing = $("#device-listing");
     var deviceListingSrc = deviceListing.attr("src");
@@ -134,10 +142,10 @@ function loadDevices(searchType, searchParam){
             var viewModel = {};
             viewModel.thumb = deviceTypesList[i].thumb;
             viewModel.appContext = clientJsAppContext;
-            viewModel.deviceTypeName = deviceTypesList[i].deviceTypeName;
-            viewModel.deviceTypeId = deviceTypesList[i].deviceTypeId;
-            viewModel.deviceCategory = deviceTypesList[i].deviceCategory;
-            viewModel.deviceTypeLabel = deviceTypesList[i].deviceTypeLabel;
+            viewModel.deviceTypeName = htmlspecialchars(deviceTypesList[i].deviceTypeName);
+            viewModel.deviceTypeId = htmlspecialchars(deviceTypesList[i].deviceTypeId);
+            viewModel.deviceCategory = htmlspecialchars(deviceTypesList[i].deviceCategory);
+            viewModel.deviceTypeLabel = htmlspecialchars(deviceTypesList[i].deviceTypeLabel);
             compileTemplate(viewModel, deviceListingSrc);
         }
     } else {

From 60ac0522d8b5e78139c756034e84f6418840b162 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 18 Jan 2017 08:14:17 +0530
Subject: [PATCH 05/13] Fixes for XSS attacks

---
 .../devicemgt/api/data-tables-invoker-api.jag |  3 ++-
 .../devicemgt/app/modules/utility.js          | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
index 0fb2945cf4..f8cfa13520 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/data-tables-invoker-api.jag
@@ -24,6 +24,7 @@ var uriMatcher = new URIMatcher(String(uri));
 
 var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
 var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];
+var utility = require("/app/modules/utility.js")["utility"];
 
 function appendQueryParam (url, queryParam , value) {
     if (url.indexOf("?") > 0) {
@@ -60,7 +61,7 @@ if (uriMatcher.match("/{context}/api/data-tables/invoker")) {
             // response callback
             function (backendResponse) {
                 response["status"] = backendResponse["status"];
-                response["content"] =  backendResponse["responseText"];
+                response["content"] =  utility.encodeJson(backendResponse["responseText"]);
             }
     );
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js
index 49b1a0d5b1..d1658872b3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js
@@ -153,5 +153,24 @@ utility = function () {
         return scopesList;
     };
 
+
+    /**
+     * Escapes special characters such as <,>,',",...etc
+     * This will prevent XSS attacks upon JSON.
+     * @param text
+     * @returns {*}
+     */
+    publicMethods.encodeJson = function (text) {
+        return text
+            .replace(/\\u003c/g, "&lt;")
+            .replace(/</g, "&lt;")
+            .replace(/\\u003e/g, "&gt;")
+            .replace(/>/g, "&gt;")
+            .replace(/\\u0027/g, "&#39;")
+            .replace(/'/g, "&#39;")
+            .replace(/\\"/g, "&quot;")
+            .replace(/\\u0022/g, "&quot;")
+    };
+
     return publicMethods;
 }();

From 51bd2b5bb6bfe2c5620b13ee76d5894e17c986d0 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 18 Jan 2017 08:29:21 +0530
Subject: [PATCH 06/13] UI improvement: Fixing buttons styles

---
 .../app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index 2dad66764f..6321372ccd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -6545,6 +6545,9 @@ select > option:hover {
   padding-right: 5px;
 }
 
+.btn-operations:hover, .btn-operations:focus, .btn-operations:active {
+    color : #C7C7C7;
+}
 
 /**
  *

From 7698c12d8056e7d980b6989acdf1149c6529b2cc Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Wed, 18 Jan 2017 10:07:59 +0530
Subject: [PATCH 07/13] removing duplicate methoads

---
 .../public/js/listing.js                      | 91 +++++++++----------
 1 file changed, 44 insertions(+), 47 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
index d841590be9..c68cfbe1f9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/js/listing.js
@@ -41,22 +41,22 @@ $(document).ready(function () {
 
     /* for device list sorting drop down */
     $(".ctrl-filter-type-switcher").popover({
-                                                html : true,
-                                                content : function () {
-                                                    return $("#content-filter-types").html();
-                                                }
-                                            });
+        html: true,
+        content: function () {
+            return $("#content-filter-types").html();
+        }
+    });
 
-    $(".ast-container").on("click", ".claim-btn", function(e){
+    $(".ast-container").on("click", ".claim-btn", function (e) {
         e.stopPropagation();
         var deviceId = $(this).data("deviceid");
         var deviceListing = $("#device-listing");
         var currentUser = deviceListing.data("current-user");
         var serviceURL = "/temp-controller-agent/enrollment/claim?username=" + currentUser;
         var deviceIdentifier = {id: deviceId, type: "TemperatureController"};
-        invokerUtil.put(serviceURL, deviceIdentifier, function(message){
+        invokerUtil.put(serviceURL, deviceIdentifier, function (message) {
             console.log(message);
-        }, function(message){
+        }, function (message) {
             console.log(message);
         });
     });
@@ -68,15 +68,15 @@ $(document).ready(function () {
  * @param button: Select All Device button
  */
 function selectAllDevices(button) {
-    if(!$(button).data('select')){
-        $(deviceCheckbox).each(function(index){
+    if (!$(button).data('select')) {
+        $(deviceCheckbox).each(function (index) {
             $(this).prop('checked', true);
             addDeviceSelectedClass(this);
         });
         $(button).data('select', true);
         $(button).html('Deselect All Devices');
-    }else{
-        $(deviceCheckbox).each(function(index){
+    } else {
+        $(deviceCheckbox).each(function (index) {
             $(this).prop('checked', false);
             addDeviceSelectedClass(this);
         });
@@ -92,7 +92,7 @@ function selectAllDevices(button) {
  * @param selection: Selection button
  */
 function changeDeviceView(view, selection) {
-    $(".view-toggle").each(function() {
+    $(".view-toggle").each(function () {
         $(this).removeClass("selected");
     });
     $(selection).addClass("selected");
@@ -117,27 +117,25 @@ function addDeviceSelectedClass(checkbox) {
 }
 
 function toTitleCase(str) {
-    return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
+    return str.replace(/\w\S*/g, function (txt) {
+        return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+    });
 }
 
 var deviceTypeCount, compiledDeviceTypesCount = 0;
 
-function htmlspecialchars(text){
-    return jQuery('<div/>').text(text).html();
-}
-
-function htmlspecialchars(text){
+function htmlspecialchars(text) {
     return jQuery('<div/>').text(text).html();
 }
 
-function loadDevices(searchType, searchParam){
+function loadDevices(searchType, searchParam) {
     var deviceListing = $("#device-listing");
     var deviceListingSrc = deviceListing.attr("src");
     var currentUser = deviceListing.data("currentUser");
 
     $('#ast-container').html("");
     deviceTypeCount = deviceTypesList.length;
-    if(deviceTypesList.length > 0){
+    if (deviceTypesList.length > 0) {
         for (var i = 0; i < deviceTypesList.length; i++) {
             var viewModel = {};
             viewModel.thumb = deviceTypesList[i].thumb;
@@ -163,12 +161,12 @@ function loadDevices(searchType, searchParam){
 
 }
 
-function compileTemplate(viewModel, templateSrc){
+function compileTemplate(viewModel, templateSrc) {
     $.template("device-listing", templateSrc, function (template) {
         $("#ast-container").html($("#ast-container").html() + template(viewModel));
         compiledDeviceTypesCount++;
-        if(deviceTypeCount == compiledDeviceTypesCount){
-            $('#device-type-grid').datatables_extended({"bFilter": false, "order": [[ 1, "asc" ]]});
+        if (deviceTypeCount == compiledDeviceTypesCount) {
+            $('#device-type-grid').datatables_extended({"bFilter": false, "order": [[1, "asc"]]});
         }
     });
 }
@@ -179,17 +177,16 @@ function compileTemplate(viewModel, templateSrc){
 var deviceCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']";
 var assetContainer = "#ast-container";
 
-function openCollapsedNav(){
+function openCollapsedNav() {
     $('.wr-hidden-nav-toggle-btn').addClass('active');
-    $('#hiddenNav').slideToggle('slideDown', function(){
-        if($(this).css('display') == 'none'){
+    $('#hiddenNav').slideToggle('slideDown', function () {
+        if ($(this).css('display') == 'none') {
             $('.wr-hidden-nav-toggle-btn').removeClass('active');
         }
     });
 }
 
 
-
 /*
  * DOM ready functions.
  */
@@ -204,22 +201,22 @@ $(document).ready(function () {
 
     /* for device list sorting drop down */
     $(".ctrl-filter-type-switcher").popover({
-                                                html : true,
-                                                content : function () {
-                                                    return $("#content-filter-types").html();
-                                                }
-                                            });
+        html: true,
+        content: function () {
+            return $("#content-filter-types").html();
+        }
+    });
 
-    $(".ast-container").on("click", ".claim-btn", function(e){
+    $(".ast-container").on("click", ".claim-btn", function (e) {
         e.stopPropagation();
         var deviceId = $(this).data("deviceid");
         var deviceListing = $("#device-listing");
         var currentUser = deviceListing.data("current-user");
         var serviceURL = "/temp-controller-agent/enrollment/claim?username=" + currentUser;
         var deviceIdentifier = {id: deviceId, type: "TemperatureController"};
-        invokerUtil.put(serviceURL, deviceIdentifier, function(message){
+        invokerUtil.put(serviceURL, deviceIdentifier, function (message) {
             console.log(message);
-        }, function(message){
+        }, function (message) {
             console.log(message);
         });
     });
@@ -230,20 +227,20 @@ $(document).ready(function () {
     $("[data-toggle=popover]").popover();
 
     $(".ctrl-filter-type-switcher").popover({
-                                                html : true,
-                                                content: function() {
-                                                    return $('#content-filter-types').html();
-                                                }
-                                            });
+        html: true,
+        content: function () {
+            return $('#content-filter-types').html();
+        }
+    });
 
     $('#nav').affix({
-                        offset: {
-                            top: $('header').height()
-                        }
-                    });
+        offset: {
+            top: $('header').height()
+        }
+    });
 
-    $(document).on("click", "tr.clickable-row", function(){
-        window.document.location =  $(this).data('href');
+    $(document).on("click", "tr.clickable-row", function () {
+        window.document.location = $(this).data('href');
     })
 
 });

From bb8985781e98185905498f5fbd6c91a38e3f719c Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Wed, 18 Jan 2017 10:22:11 +0530
Subject: [PATCH 08/13] removing duplicate methoads

---
 .../app/pages/cdmf.page.policies/public/js/policy-list.js      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
index 39742fd9dc..0d94332844 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
@@ -109,9 +109,6 @@ function getSelectedPolicies() {
     return policyList;
 }
 
-function htmlspecialchars(text){
-    return jQuery('<div/>').text(text).html();
-}
 
 $(document).ready(function () {
 

From bdfb816ffc246edb0ab6f99af6c12fb95b6e94ed Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <dimal.chandrasiri@gmail.com>
Date: Wed, 18 Jan 2017 11:43:49 +0530
Subject: [PATCH 09/13] Fix for issue where list item operations getting fired
 even after cancelling list item selection

---
 .../public/js/dataTables.extended.serversidepaging.js            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
index 243df02a4d..9ca788dc43 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js
@@ -273,6 +273,7 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
                         thisTable.removeClass("table-selectable");
                         $(button).addClass("active").html('Select');
                         $(button).parent().next().children().addClass("disabled");
+                        $('.DTTT_selected.selected').removeClass(rowSelectedClass);
                         // EMM related function
                         $(document).on('click', '.viewEnabledIcon', InitiateViewOption);
                         //--- End of EMM related codes

From 1f5448c2a0d22874e2b247b60950709462aec7e9 Mon Sep 17 00:00:00 2001
From: Maninda <mwe163@gmail.com>
Date: Wed, 18 Jan 2017 12:36:11 +0530
Subject: [PATCH 10/13] Corrected  the caching filter pattern

---
 .../src/main/webapp/WEB-INF/web.xml                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml
index aa49482557..b23f60be4c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml
@@ -89,7 +89,7 @@
         <filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
         <init-param>
             <param-name>patterns</param-name>
-            <param-value>"text/html*","application/json*","text/plain*"</param-value>
+            <param-value>text/html" ,application/json" ,text/plain</param-value>
         </init-param>
         <init-param>
             <param-name>filterAction</param-name>

From e8ffe60e8c0f852b4911ec5029967b87b1f50eb3 Mon Sep 17 00:00:00 2001
From: Jasintha <jasinthad@gmail.com>
Date: Wed, 18 Jan 2017 14:27:05 +0530
Subject: [PATCH 11/13] Fixing firealam policy push notification issue

---
 .../pom.xml                                   |  1 +
 .../mqtt/MQTTNotificationStrategy.java        | 50 +++++++++++++++----
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
index 703f3ba348..c885da4270 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
@@ -144,6 +144,7 @@
                             org.wso2.carbon.event.output.adapter.core,
                             org.wso2.carbon.event.output.adapter.core.exception,
                             org.osgi.framework,
+                            org.wso2.carbon.device.mgt.core.operation.mgt,
                             org.wso2.carbon.core
                         </Import-Package>
                     </instructions>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java
index 03f2d8f9d3..93be818999 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java
@@ -22,17 +22,21 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
+import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
 import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
 import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.MessageType;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
+import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -57,7 +61,7 @@ public class MQTTNotificationStrategy implements NotificationStrategy {
         configProperties.put(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_USERNAME,
                 config.getProperty(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_USERNAME));
         configProperties.put(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_PASSWORD,
-                             config.getProperty(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_PASSWORD));
+                config.getProperty(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_PASSWORD));
         configProperties.put(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_CLEAR_SESSION,
                 config.getProperty(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_CLEAR_SESSION));
         configProperties.put(MQTTAdapterConstants.MQTT_ADAPTER_PROPERTY_SCOPES,
@@ -79,23 +83,48 @@ public class MQTTNotificationStrategy implements NotificationStrategy {
 
     @Override
     public void execute(NotificationContext ctx) throws PushNotificationExecutionFailedException {
-        Map<String, String> dynamicProperties = new HashMap<>();
+
         Operation operation = ctx.getOperation();
         Properties properties = operation.getProperties();
         if (properties != null && properties.get(MQTT_ADAPTER_TOPIC) != null) {
+            Map<String, String> dynamicProperties = new HashMap<>();
             dynamicProperties.put("topic", (String) properties.get(MQTT_ADAPTER_TOPIC));
+            MQTTDataHolder.getInstance().getOutputEventAdapterService().publish(mqttAdapterName, dynamicProperties,
+                    operation.getPayLoad());
         } else {
-            String topic = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true) + "/"
-                    + ctx.getDeviceId().getType() + "/" + ctx.getDeviceId().getId() + "/" + operation.getType()
-                    .toString().toLowerCase() + "/" + operation.getCode();
-            dynamicProperties.put("topic", topic);
-            if (operation.getPayLoad() == null) {
-                operation.setPayLoad("");
+            if (PolicyOperation.POLICY_OPERATION_CODE.equals(operation.getCode())) {
+                PolicyOperation policyOperation = (PolicyOperation) operation;
+                List<ProfileOperation> profileOperations = policyOperation.getProfileOperations();
+                String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true);
+                String deviceType = ctx.getDeviceId().getType();
+                String deviceId = ctx.getDeviceId().getId();
+                for (ProfileOperation profileOperation : profileOperations) {
+                    Map<String, String> dynamicProperties = new HashMap<>();
+                    String topic = tenantDomain + "/"
+                            + deviceType + "/" + deviceId + "/" + profileOperation.getType()
+                            .toString().toLowerCase() + "/" + profileOperation.getCode().toLowerCase();
+                    dynamicProperties.put("topic", topic);
+                    MQTTDataHolder.getInstance().getOutputEventAdapterService().publish(mqttAdapterName, dynamicProperties,
+                            profileOperation.getPayLoad());
+                }
+
+            } else {
+                Map<String, String> dynamicProperties = new HashMap<>();
+                String topic = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true) + "/"
+                        + ctx.getDeviceId().getType() + "/" + ctx.getDeviceId().getId() + "/" + operation.getType()
+                        .toString().toLowerCase() + "/" + operation.getCode();
+                dynamicProperties.put("topic", topic);
+                if (operation.getPayLoad() == null) {
+                    operation.setPayLoad("");
+                }
+                MQTTDataHolder.getInstance().getOutputEventAdapterService().publish(mqttAdapterName, dynamicProperties,
+                        operation.getPayLoad());
+
             }
+
         }
 
-        MQTTDataHolder.getInstance().getOutputEventAdapterService().publish(mqttAdapterName, dynamicProperties,
-                                                                            operation.getPayLoad());
+
     }
 
     @Override
@@ -109,3 +138,4 @@ public class MQTTNotificationStrategy implements NotificationStrategy {
     }
 
 }
+

From 1bec5e51860eeeaacb55c6d3e9c1e6d988bc23e7 Mon Sep 17 00:00:00 2001
From: sameera910409 <sameera910409@gmail.com>
Date: Wed, 18 Jan 2017 14:52:12 +0530
Subject: [PATCH 12/13] fixed user password reset failure issue in iot console

---
 .../mgt/jaxrs/service/api/admin/UserManagementAdminService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java
index c6c7130926..b909ff609b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java
@@ -72,7 +72,7 @@ import javax.ws.rs.core.Response;
         "Further, this is strictly restricted to admin users only ")
 public interface UserManagementAdminService {
 
-    @PUT
+    @POST
     @Path("/{username}/credentials")
     @ApiOperation(
             consumes = MediaType.APPLICATION_JSON,

From e9c3a0c3e81b48ed7c1bcd061ef2b92ff29594f8 Mon Sep 17 00:00:00 2001
From: Milan Perera <milan@wso2.com>
Date: Wed, 18 Jan 2017 18:14:55 +0530
Subject: [PATCH 13/13] Fixed token expiration issue

---
 .../oauth/token-protected-service-invokers.js | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
index d29498a318..ed40ee7de8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
@@ -117,15 +117,44 @@ var invokers = function () {
         log.debug("Response status : " + xmlHttpRequest.status);
         log.debug("Response payload if any : " + xmlHttpRequest.responseText);
 
-        if (xmlHttpRequest.status == 401 && (xmlHttpRequest.responseText == TOKEN_EXPIRED ||
-                                             xmlHttpRequest.responseText == TOKEN_INVALID ) && count < 5) {
-            tokenUtil.refreshTokenPair();
-            return privateMethods.execute(httpMethod, requestPayload, endpoint, responseCallback, ++count, headers);
-        } else {
+        if (xmlHttpRequest.status == 401) {
+            if ((xmlHttpRequest.responseText == TOKEN_EXPIRED ||
+                xmlHttpRequest.responseText == TOKEN_INVALID ) && count < 5) {
+                tokenUtil.refreshTokenPair();
+                return privateMethods.execute(httpMethod, requestPayload, endpoint, responseCallback, ++count, headers);
+            } else if (privateMethods.isInvalidCredential(xmlHttpRequest.responseText)) {
+                tokenUtil.refreshTokenPair();
+                return privateMethods.execute(httpMethod, requestPayload, endpoint, responseCallback, ++count, headers);
+            }
+         } else {
             return responseCallback(xmlHttpRequest);
-        }
+         }
     };
 
+
+    /**
+     * This method verify whether the access token is expired using response payload.
+     * This is required when using API gateway.
+     * @param responsePayload response payload.
+     * return true if it is invalid otherwise false.
+     */
+    privateMethods["isInvalidCredential"] =
+        function (responsePayload) {
+            if (responsePayload) {
+                try {
+                    payload = parse(responsePayload);
+                    if (payload["fault"]["code"] == 900901) {
+                        log.debug("Access token is invalid: " + payload["fault"]["code"]);
+                        log.debug(payload["fault"]["description"]);
+                        return true;
+                    }
+                } catch (err) {
+                    // do nothing
+                }
+            }
+            return false;
+        };
+
     /**
      * This method add Oauth authentication header to outgoing XML-HTTP Requests if Oauth authentication is enabled.
      * @param httpMethod HTTP request type.