Translate fix in old UI, loading controller new UI fix

Change-Id: I8bf6c48d6baf9a59b99a2da980ce078637de567d
Signed-off-by: Daniel Malachovsky <dmalacho@cisco.com>

diff --git a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/gbp.module.js b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/gbp.module.js
index 96d7d2d81564edb97e239240d6c85381bc8ec124..e92550cc07d40be658589479c371113e4e6a756f 100644 (file)
--- a/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/gbp.module.js
+++ b/groupbasedpolicy-old-ui/module/src/main/resources/gbp-old/gbp.module.js
@@ -1,15 +1,13 @@
-define(['angularAMD', 'app/routingConfig', 'ui-bootstrap', 'Restangular', 'angular-translate'], function() {
+define(['angularAMD', 'app/routingConfig', 'ui-bootstrap', 'Restangular', 'angular-translate-loader-partial'], function() {
 
   var gbpOld = angular.module('app.gbpOld', ['ui.router.state','app.core', 'ui.bootstrap', 'restangular', 'pascalprecht.translate']);
 
     gbpOld.register = gbpOld;
 
-    gbpOld.config(function ($stateProvider, $compileProvider, $controllerProvider, $provide, $translateProvider, NavHelperProvider, $filterProvider) {
+    gbpOld.config(function ($stateProvider, $compileProvider, $controllerProvider, $provide, $translateProvider,
+                            $translatePartialLoaderProvider, NavHelperProvider, $filterProvider) {
 
-    $translateProvider.useStaticFilesLoader({
-      prefix: 'assets/data/locale-',
-      suffix: '.json'
-    });
+        //$translatePartialLoaderProvider.addPart('app/gbp/assets/data/locale');
 
         gbpOld.register = {
       directive : $compileProvider.directive,

diff --git a/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.controller.js b/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.controller.js
index c8ba87064de5f6a9c5397b5759ed332f7869bcd7..c6596231b512c302b55294c03eb8a8167c49c799 100644 (file)
--- a/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.controller.js
+++ b/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.controller.js
@@ -1,4 +1,4 @@
-define('app/gbp/gbp.module', function (gbp) {
+define(['app/gbp/gbp.module'], function (gbp) {
 
   gbp.register.controller('rootGbpCtrl', ['$rootScope', '$scope',
     function ($rootScope, $scope) {

diff --git a/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.module.js b/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.module.js
index fb9e51360f7be53395a203fcb27ddea87e08d7a0..afb5b3723d744bea180311042113868c19f285e7 100644 (file)
--- a/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.module.js
+++ b/groupbasedpolicy-ui/module/src/main/resources/gbp/gbp.module.js
@@ -10,7 +10,7 @@ define([
 
     gbp.register = gbp; // for adding services, controllers, directives etc. to angular module before bootstrap
 
-    gbp.config(function ($stateProvider, $compileProvider, $controllerProvider, $provide, NavHelperProvider,
+    gbp.config(function ($stateProvider,$compileProvider,$controllerProvider, $provide, NavHelperProvider,
                          $translateProvider, $translatePartialLoaderProvider) {
         gbp.register = {
             controller: $controllerProvider.register,