From 90f3ea072994e8132e7b4e2bbf56e697cc639f61 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 5 Jul 2017 11:24:53 +0200
Subject: [PATCH] fix admin actions V2
---
.../angular/app/action-administration.component.js | 4 ++--
.../angular/app/action-administration.component.ts | 4 ++--
apps/maarch_entreprise/js/angular/app/app.module.js | 12 ++++++------
apps/maarch_entreprise/js/angularFunctions.js | 8 +++++++-
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/action-administration.component.js b/apps/maarch_entreprise/js/angular/app/action-administration.component.js
index 85bd4dc714d..5412e5adf23 100644
--- a/apps/maarch_entreprise/js/angular/app/action-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/action-administration.component.js
@@ -49,7 +49,7 @@ var ActionAdministrationComponent = (function () {
.subscribe(function (data) {
_this.action = data.action;
_this.lang = data.lang;
- _this.lang.pageTitle = _this.lang.modify_action + ' : ' + _this.action.action_id;
+ _this.lang.pageTitle = _this.lang.add + ' ' + _this.lang.action;
_this.categoriesList = data.categoriesList;
_this.statusList = data.statusList;
_this.actionPagesList = data.action_pagesList;
@@ -66,8 +66,8 @@ var ActionAdministrationComponent = (function () {
.map(function (res) { return res.json(); })
.subscribe(function (data) {
_this.lang = data.lang;
- _this.lang.pageTitle = _this.lang.add + ' ' + _this.lang.action;
_this.action = data.action;
+ _this.lang.pageTitle = _this.lang.modify_action + ' : ' + _this.action.id;
_this.categoriesList = data.categoriesList;
_this.statusList = data.statusList;
_this.actionPagesList = data.action_pagesList;
diff --git a/apps/maarch_entreprise/js/angular/app/action-administration.component.ts b/apps/maarch_entreprise/js/angular/app/action-administration.component.ts
index 3a532a434e6..a222b2e7cbc 100644
--- a/apps/maarch_entreprise/js/angular/app/action-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/action-administration.component.ts
@@ -56,7 +56,7 @@ export class ActionAdministrationComponent implements OnInit {
.subscribe((data) => {
this.action = data.action;
this.lang = data.lang;
- this.lang.pageTitle = this.lang.modify_action+' : '+this.action.action_id
+ this.lang.pageTitle = this.lang.add+' '+this.lang.action;
this.categoriesList = data.categoriesList;
this.statusList = data.statusList;
@@ -75,8 +75,8 @@ export class ActionAdministrationComponent implements OnInit {
.map(res => res.json())
.subscribe((data) => {
this.lang= data.lang;
- this.lang.pageTitle = this.lang.add+' '+this.lang.action
this.action = data.action;
+ this.lang.pageTitle = this.lang.modify_action+' : '+this.action.id;
this.categoriesList = data.categoriesList;
this.statusList = data.statusList;
diff --git a/apps/maarch_entreprise/js/angular/app/app.module.js b/apps/maarch_entreprise/js/angular/app/app.module.js
index 0a3409fabae..198e917437f 100644
--- a/apps/maarch_entreprise/js/angular/app/app.module.js
+++ b/apps/maarch_entreprise/js/angular/app/app.module.js
@@ -12,7 +12,8 @@ var router_1 = require("@angular/router");
var http_1 = require("@angular/http");
var forms_1 = require("@angular/forms");
var app_component_1 = require("./app.component");
-var header_component_1 = require("./header.component");
+//import { HeaderComponent } from './header.component';
+var administration_component_1 = require("./administration.component");
var users_administration_component_1 = require("./users-administration.component");
var user_administration_component_1 = require("./user-administration.component");
var status_list_administration_component_1 = require("./status-list-administration.component");
@@ -24,7 +25,6 @@ var parameter_component_1 = require("./parameter.component");
var parameters_component_1 = require("./parameters.component");
var priorities_component_1 = require("./priorities.component");
var priority_component_1 = require("./priority.component");
-var administration_component_1 = require("./administration.component");
var signature_book_component_1 = require("./signature-book.component");
var reports_component_1 = require("./reports.component");
var AppModule = (function () {
@@ -41,10 +41,11 @@ AppModule = __decorate([
router_1.RouterModule.forRoot([
{ path: 'administration', component: administration_component_1.AdministrationComponent },
{ path: 'administration/users', component: users_administration_component_1.UsersAdministrationComponent },
- { path: 'administration/users/:userId', component: user_administration_component_1.UserAdministrationComponent },
- { path: 'administration/status/create', component: status_administration_component_1.StatusAdministrationComponent },
- { path: 'administration/status/update/:id', component: status_administration_component_1.StatusAdministrationComponent },
+ { path: 'administration/users/new', component: user_administration_component_1.UserAdministrationComponent },
+ { path: 'administration/users/:id', component: user_administration_component_1.UserAdministrationComponent },
{ path: 'administration/status', component: status_list_administration_component_1.StatusListAdministrationComponent },
+ { path: 'administration/status/new', component: status_administration_component_1.StatusAdministrationComponent },
+ { path: 'administration/status/:identifier', component: status_administration_component_1.StatusAdministrationComponent },
{ path: 'profile', component: profile_component_1.ProfileComponent },
{ path: 'administration/parameter/create', component: parameter_component_1.ParameterComponent },
{ path: 'administration/parameter/update/:id', component: parameter_component_1.ParameterComponent },
@@ -62,7 +63,6 @@ AppModule = __decorate([
http_1.HttpModule
],
declarations: [
- header_component_1.HeaderComponent,
app_component_1.AppComponent,
action_administration_component_1.ActionAdministrationComponent,
actions_administration_component_1.ActionsAdministrationComponent,
diff --git a/apps/maarch_entreprise/js/angularFunctions.js b/apps/maarch_entreprise/js/angularFunctions.js
index 4e6da86e339..3a805d20dd5 100644
--- a/apps/maarch_entreprise/js/angularFunctions.js
+++ b/apps/maarch_entreprise/js/angularFunctions.js
@@ -7,8 +7,14 @@ function triggerAngular(prodmode, locationToGo) {
'user-administration',
'status-administration',
'statuses-administration',
+ 'actions-administration',
+ 'action-administration',
'profile',
- 'signature-book'
+ 'signature-book',
+ 'parameters',
+ 'priorities',
+ 'priority',
+ 'parameter'
];
$j.ajax({
--
GitLab