Merge pull request #922 from hashmapinc/Tempus-906

Tempus-906-Remove gatway option for customeruser
hashmapinc · Jan 13, 2019 · 2eb188f · 2eb188f
2 parents 86dd62a + 45b7ae7
commit 2eb188f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ui/src/app/device/device-fieldset.tpl.html b/ui/src/app/device/device-fieldset.tpl.html
@@ -80,7 +80,7 @@
                 ng-model="device.type"
                 entity-type="types.entityType.device">
         </tb-entity-subtype-autocomplete>
-        <md-input-container class="md-block">
+        <md-input-container class="md-block" ng-if = "authority !== 'CUSTOMER_USER'">
             <md-checkbox ng-disabled="$root.loading || !isEdit" flex aria-label="{{ 'device.is-gateway' | translate }}"
                          ng-model="device.additionalInfo.gateway">{{ 'device.is-gateway' | translate }}
             </md-checkbox>

diff --git a/ui/src/app/device/device.directive.js b/ui/src/app/device/device.directive.js
@@ -21,7 +21,8 @@ import deviceFieldsetTemplate from './device-fieldset.tpl.html';
 /* eslint-enable import/no-unresolved, import/default */
 
 /*@ngInject*/
-export default function DeviceDirective($compile,$templateCache,datamodelService, toast, $translate, types, clipboardService, deviceService, customerService) {
+
+export default function DeviceDirective($compile,$rootScope,$templateCache,datamodelService, toast, $translate, types, clipboardService, deviceService, customerService) {
     var linker = function (scope, element) {
         var template = $templateCache.get(deviceFieldsetTemplate);
         element.html(template);
@@ -34,6 +35,7 @@ export default function DeviceDirective($compile,$templateCache,datamodelService
         scope.isAssignedToDataModel = false;
         scope.assignedToDataModelObject = false;
 
+        scope.authority = $rootScope.authority;
 
         scope.$watch('device', function(newVal) {
             if (newVal) {