Merge pull request #66 from deaflynx/develop/2.6-edge

Develop/2.6 edge fix import rule chains, added button, locale for edge

ui/src/app/edge/edge-fieldset.tpl.html

@@ -21,6 +21,9 @@
 <md-button ng-click="onUnassignFromCustomer({event: $event, isPublic: isPublic})"
            ng-show="!isEdit && (edgeScope === 'customer' || edgeScope === 'tenant') && isAssignedToCustomer"
            class="md-raised md-primary">{{ isPublic ? 'edge.make-private' : 'edge.unassign-from-customer' | translate }}</md-button>
+<md-button ng-click="onMakePublic({event: $event})"
+           ng-show="!isEdit && edgeScope === 'tenant' && !isAssignedToCustomer && !isPublic"
+           class="md-raised md-primary">{{ 'edge.make-public' | translate }}</md-button>
 <md-button ng-click="onManageEdgeAssets({event: $event})"
            ng-show="!isEdit && edgeScope === 'tenant'"
            class="md-raised md-primary">{{ 'edge.manage-edge-assets' | translate }}</md-button>

ui/src/app/import-export/import-export.service.js

@@ -310,7 +310,7 @@ export default function ImportExport($log, $translate, $q, $mdDialog, $document,
             return false;
         }
         if (angular.isUndefined(ruleChainImport.ruleChain.type)) {
-            return false;
+            ruleChainImport.ruleChain.type = types.ruleChainType.core;
         }
         return true;
     }

ui/src/app/locale/locale.constant-en_US.json

@@ -849,7 +849,10 @@
         "deployed": "Deployed",
         "pending": "Pending",
         "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer",
-        "enter-edge-type": "Enter edge type"
+        "enter-edge-type": "Enter edge type",
+        "no-edge-types-matching": "No edge types matching '{{entitySubtype}}' were found.",
+        "edge-type-list-empty": "No edge types selected.",
+        "edge-types": "Edge types"
     },
     "error": {
         "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",