From fd4d04756a218a8a2f3bfe7e93c6b9b7592ea219 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 16 May 2023 08:54:54 +0200 Subject: [PATCH] refs #5334 routes index fix --- front/salix/components/left-menu/left-menu.js | 1 - modules/worker/front/department/basic-data/index.js | 2 +- modules/worker/front/department/card/index.js | 2 +- modules/worker/front/department/descriptor/index.js | 2 +- modules/worker/front/department/index.js | 4 ++-- modules/worker/front/department/main/index.js | 2 +- modules/worker/front/department/summary/index.js | 2 +- modules/worker/front/index.js | 2 +- modules/worker/front/routes.json | 6 ------ 9 files changed, 8 insertions(+), 15 deletions(-) diff --git a/front/salix/components/left-menu/left-menu.js b/front/salix/components/left-menu/left-menu.js index 6bec61775..a0392ccce 100644 --- a/front/salix/components/left-menu/left-menu.js +++ b/front/salix/components/left-menu/left-menu.js @@ -45,7 +45,6 @@ export default class LeftMenu { if (acl && !this.aclService.hasAny(acl)) continue; } - console.log(state, item); let myItem = { icon: item.icon, description: item.description || state.description, diff --git a/modules/worker/front/department/basic-data/index.js b/modules/worker/front/department/basic-data/index.js index ea75d7b97..1f2dd848c 100644 --- a/modules/worker/front/department/basic-data/index.js +++ b/modules/worker/front/department/basic-data/index.js @@ -1,4 +1,4 @@ -import ngModule from '../module'; +import ngModule from '../../module'; import Section from 'salix/components/section'; class Controller extends Section { diff --git a/modules/worker/front/department/card/index.js b/modules/worker/front/department/card/index.js index 288c1a8c3..c7bf32569 100644 --- a/modules/worker/front/department/card/index.js +++ b/modules/worker/front/department/card/index.js @@ -1,4 +1,4 @@ -import ngModule from '../module'; +import ngModule from '../../module'; import ModuleCard from 'salix/components/module-card'; class Controller extends ModuleCard { diff --git a/modules/worker/front/department/descriptor/index.js b/modules/worker/front/department/descriptor/index.js index af57643b7..12ec396a6 100644 --- a/modules/worker/front/department/descriptor/index.js +++ b/modules/worker/front/department/descriptor/index.js @@ -1,4 +1,4 @@ -import ngModule from '../module'; +import ngModule from '../../module'; import Descriptor from 'salix/components/descriptor'; class Controller extends Descriptor { diff --git a/modules/worker/front/department/index.js b/modules/worker/front/department/index.js index 5dcbe4097..3e4db6106 100644 --- a/modules/worker/front/department/index.js +++ b/modules/worker/front/department/index.js @@ -3,6 +3,6 @@ import './index/'; import './summary'; import './card'; import './descriptor'; -import './create'; +// import './create'; import './basic-data'; -import './search-panel'; +// import './search-panel'; diff --git a/modules/worker/front/department/main/index.js b/modules/worker/front/department/main/index.js index 246f8fe49..3fda47246 100644 --- a/modules/worker/front/department/main/index.js +++ b/modules/worker/front/department/main/index.js @@ -1,4 +1,4 @@ -import ngModule from '../module'; +import ngModule from '../../module'; import ModuleMain from 'salix/components/module-main'; export default class Department extends ModuleMain {} diff --git a/modules/worker/front/department/summary/index.js b/modules/worker/front/department/summary/index.js index ede559d18..cef13c479 100644 --- a/modules/worker/front/department/summary/index.js +++ b/modules/worker/front/department/summary/index.js @@ -1,4 +1,4 @@ -import ngModule from '../module'; +import ngModule from '../../module'; import Summary from 'salix/components/summary'; class Controller extends Summary { diff --git a/modules/worker/front/index.js b/modules/worker/front/index.js index 605ec9dde..8fad2c0df 100644 --- a/modules/worker/front/index.js +++ b/modules/worker/front/index.js @@ -11,7 +11,7 @@ import './search-panel'; import './basic-data'; import './pbx'; import './pda'; -import './department/index'; +import './department'; import './calendar'; import './time-control'; import './log'; diff --git a/modules/worker/front/routes.json b/modules/worker/front/routes.json index 50245b571..3f4f1977d 100644 --- a/modules/worker/front/routes.json +++ b/modules/worker/front/routes.json @@ -129,12 +129,6 @@ "component": "vn-worker-department-card", "abstract": true, "description": "Detail" - }, { - "url" : "/index", - "state": "worker.department.index", - "component": "vn-worker-department-index", - "description": "Department", - "acl": ["hr"] }, { "url" : "/summary", "state": "worker.department.card.summary",