From ea7f62a980b7ba7b5c05fd23ec96d1e791b08d6d Mon Sep 17 00:00:00 2001 From: dilanua Date: Thu, 8 Sep 2016 23:21:57 +0530 Subject: [PATCH] Adding permissions to device listing and bug fixes --- .../app/pages/mdm.page.devices/devices.hbs | 240 ++++++------ .../app/pages/mdm.page.devices/devices.js | 41 ++- .../public/images/TemperatureController.png | Bin 234616 -> 0 bytes .../public/images/android.png | Bin 2948 -> 0 bytes .../mdm.page.devices/public/images/ios.png | Bin 6966 -> 0 bytes .../public/js/device-listing.js | 341 +++--------------- .../public/templates/device-listing.hbs | 42 --- 7 files changed, 189 insertions(+), 475 deletions(-) delete mode 100644 components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/images/TemperatureController.png delete mode 100755 components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/images/android.png delete mode 100644 components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/images/ios.png delete mode 100644 components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/templates/device-listing.hbs diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs index ca88bd53b..0c5652957 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs @@ -28,6 +28,7 @@
  • + Devices @@ -35,132 +36,131 @@ {{/zone}} {{#zone "navbarActions"}} -{{!-- #if permissions.enroll --}} -
  • - - - - - - - - - - - Enroll Device - -
  • - {{!-- /if --}} -
  • - - - - - - - - - - - Advanced Search - -
  • + {{#if permissions.ENROLL_DEVICE}} +
  • + + + + + + + + + + +   Enroll Device + +
  • + {{/if}} + {{#if permissions.ADVANCED_SEARCH}} +
  • + + + + + + + + + + +   Advanced Search + +
  • + {{/if}} {{/zone}} {{#zone "content"}} - -
    - -     - Loading devices . . . -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    By Device NameBy OwnerBy StatusBy PlatformBy Ownership
    -
    -
    -