-
exit_to_app
+
exit_to_app
apps
notifications
account_circle
diff --git a/@salix/app/src/components/main-menu/main-menu.js b/@salix/app/src/components/main-menu/main-menu.js
index afb5869c3d..aa20ba198c 100644
--- a/@salix/app/src/components/main-menu/main-menu.js
+++ b/@salix/app/src/components/main-menu/main-menu.js
@@ -5,6 +5,7 @@ import {module} from '../../module';
export const NAME = 'vnMainMenu';
export const COMPONENT = {
template: template,
+ controllerAs: "mainMenu",
controller: function ()
{
this.onLogoutClick = function ()
diff --git a/@salix/app/src/configroutes.js b/@salix/app/src/configroutes.js
index c21ef7a7a2..2a5ae738e3 100644
--- a/@salix/app/src/configroutes.js
+++ b/@salix/app/src/configroutes.js
@@ -4,6 +4,7 @@ import * as deps from './spliting/deps.json';
function loader(module) {
+
return function load($ocLazyLoad, $q){
return $q((resolve) => {
core.splitingRegister.execute(module).then(function (dependencies) {
@@ -16,37 +17,37 @@ function loader(module) {
load.$inject = ['$ocLazyLoad', '$q'];
}
-function getParams(route){
+function getParams(route) {
var params = "",
- temporalParams=[];
-
- if(!route.params){
+ temporalParams = [];
+
+ if (!route.params) {
return params;
}
-
- Object.keys(route.params).forEach((key)=>{
+
+ Object.keys(route.params).forEach(key => {
temporalParams.push(key + `= "${route.params[key]}"`);
});
- return temporalParams.join(" ");
+ return temporalParams.join(" ");
}
function config($stateProvider, $urlRouterProvider) {
core.splitingRegister.registerGraph(deps);
$urlRouterProvider.otherwise('/clients');
- for (var file in routes)
+ for (var file in routes)
{
let fileRoutes = routes[file].routes;
- let module = routes[file].module;
+ let module = routes[file].module;
fileRoutes.forEach(function(route) {
$stateProvider.state(route.state, {
url: route.url,
template: `<${route.component} full-height ${getParams(route)}>`,
resolve: {
- loader: loader(module)
- }
- })
+ loader: loader(module)
+ }
+ });
});
}
}
diff --git a/@salix/crud/src/client/addresses/index.html b/@salix/crud/src/client/addresses/index.html
index d8bb95e7aa..e51684d82c 100644
--- a/@salix/crud/src/client/addresses/index.html
+++ b/@salix/crud/src/client/addresses/index.html
@@ -5,7 +5,7 @@
Consignee
Enabled
-
+
diff --git a/@salix/crud/src/client/addresses/index.js b/@salix/crud/src/client/addresses/index.js
index 1770cd80ce..f00d9ea39a 100644
--- a/@salix/crud/src/client/addresses/index.js
+++ b/@salix/crud/src/client/addresses/index.js
@@ -4,23 +4,25 @@ import {module} from '../../module';
export const NAME = 'vnClientAddresses';
export const COMPONENT = {
template: template,
- controller: function ($http)
- {
- this.addresses = [];
+ controllerAs: 'address',
+ controller: function($http)
+ {
- for (var i = 1; i <= 4; i++)
- this.addresses.push ({
- "consignee": "Consignee",
- "street": "Street",
- "city": "City",
- "postcode": "46600",
- "province": "Province",
- "country": "Country",
- "phone": "+XX XXX XX XX XX",
- "mobile": "+XX 6XX XX XX XX",
- "enabled": true
- });
- },
+ this.addresses = [];
+
+ for (var i = 1; i <= 4; i++)
+ this.addresses.push({
+ consignee: "Consignee",
+ street: "Street",
+ city: "City",
+ postcode: "46600",
+ province: "Province",
+ country: "Country",
+ phone: "+XX XXX XX XX XX",
+ mobile: "+XX 6XX XX XX XX",
+ enabled: true
+ });
+ }
};
COMPONENT.controller.$inject = ['$http'];
diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html
index 92558f1c9c..1d9faafcfb 100644
--- a/@salix/crud/src/client/basic-data/index.html
+++ b/@salix/crud/src/client/basic-data/index.html
@@ -1,20 +1,20 @@
-