Merge pull request #710 from rasika/master

Fixing Policy view and policy edit doesn't honor isCloud param

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs

@@ -1,7 +1,7 @@
 {{#zone "content"}}
     {{#if isAuthorized}}
-        <span id="logged-in-user" class="hidden" data-username="{{user.username}}" data-domain="{{user.domain}}"
+        <span id="logged-in-user" class="hidden" data-username="{{@user.username}}" data-domain="{{@user.domain}}"
-              data-tenant-id="{{user.tenantId}}" data-iscloud="{{isCloud}}"></span>
+              data-tenant-id="{{@user.tenantId}}" data-iscloud="{{isCloud}}"></span>
         <div class="row">
             <div class="col-md-12">
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.js

@@ -67,8 +67,6 @@ function onRequest(context) {
         }
     }
 
-    var user = userModule.getCarbonUser();
-    types["user"] = {username: user.username, domain: user.domain, tenantId: user.tenantId};
     var roles = userModule.getRoles();
     if (roles["status"] == "success") {
         types["roles"] = roles["content"];

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs

@@ -1,7 +1,7 @@
 {{#zone "content"}}
     {{#if isAuthorized }}
-        <span id="logged-in-user" class="hidden" data-username="{{user.username}}" data-domain="{{user.domain}}"
+        <span id="logged-in-user" class="hidden" data-username="{{@user.username}}" data-domain="{{@user.domain}}"
-              data-tenant-id="{{user.tenantId}}"></span>
+              data-tenant-id="{{@user.tenantId}}" data-iscloud="{{isCloud}}"></span>
         <span id="policy-operations" class="hidden" data-template="{{policyOperations.template}}"
               data-script="{{policyOperations.script}}" data-style="{{policyOperations.style}}"></span>
         <div class="row">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.js

@@ -60,5 +60,8 @@ function onRequest(context) {
     context.isAuthorizedViewRoles = userModule.isAuthorized("/permission/admin/device-mgt/users/view");
     context.isAuthorizedViewGroups = userModule.isAuthorized("/permission/admin/device-mgt/groups/view");
 
+    var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
+    context["isCloud"] = devicemgtProps.isCloud;
+
     return context;
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js

@@ -196,7 +196,7 @@ skipStep["policy-platform"] = function (policyPayloadObj) {
             hasPolicyProfileScript = false;
         }
         $.template(policyEditTemplateCacheKey, context + policyEditTemplateSrc, function (template) {
-            var content = template();
+            var content = template({"iscloud" : $("#logged-in-user").data("iscloud")});
             $("#device-type-policy-operations").html(content).removeClass("hidden");
             $(".policy-platform").addClass("hidden");
             if (hasPolicyProfileScript) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js

@@ -84,7 +84,7 @@ var displayPolicy = function (policyPayloadObj) {
             hasPolicyProfileScript = false;
         }
         $.template(policyViewTemplateCacheKey, context + policyViewTemplateSrc, function (template) {
-            var content = template();
+            var content = template({"iscloud" : $("#logged-in-user").data("iscloud")});
             $("#device-type-policy-operations").html(content).removeClass("hidden");
             $(".policy-platform").addClass("hidden");
             if (hasPolicyProfileScript) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs

@@ -1,5 +1,7 @@
 {{#zone "content"}}
     {{#if isAuthorized}}
+        <span id="logged-in-user" class="hidden" data-username="{{@user.username}}" data-domain="{{@user.domain}}"
+              data-tenant-id="{{@user.tenantId}}" data-iscloud="{{isCloud}}"></span>
         {{#defineZone "policy-profile-top"}}
             <div class="row wr-device-board">
                 <div class="col-lg-12 wr-secondary-bar">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.js

@@ -39,5 +39,9 @@ function onRequest(context) {
         }
     }
     page.isAuthorized = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
+
+    var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
+    page["isCloud"] = devicemgtProps.isCloud;
+    
     return page;
 }