From d11ee09f6fc511d6f7000fba35ad6aedfc65c92b Mon Sep 17 00:00:00 2001 From: Thomas Duval Date: Tue, 7 Nov 2017 09:16:52 +0100 Subject: Update GUI code to the latest available. Change-Id: Iccb0c4b94215cce1ea0697a16d271fd186c17284 --- .../edit/parameter/assignments/assignments-list.tpl.html | 0 .../edit/parameter/assignments/assignments.list.dir.js | 12 ++++++------ .../static/app/policy/edit/parameter/data/data-list.tpl.html | 0 .../static/app/policy/edit/parameter/data/data.edit.dir.js | 0 .../static/app/policy/edit/parameter/data/data.list.dir.js | 0 .../policy/edit/parameter/perimeter/perimeter-list.tpl.html | 0 .../policy/edit/parameter/perimeter/perimeter.list.dir.js | 0 .../app/policy/edit/parameter/rules/rules-list.tpl.html | 0 .../static/app/policy/edit/parameter/rules/rules.list.dir.js | 0 9 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-list.tpl.html mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/data/data-list.tpl.html mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/data/data.edit.dir.js mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/data/data.list.dir.js mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-list.tpl.html mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.list.dir.js mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html mode change 100644 => 100755 moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js (limited to 'moonv4/moon_gui/static/app/policy/edit/parameter') diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-list.tpl.html old mode 100644 new mode 100755 diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js old mode 100644 new mode 100755 index e396f74e..22931e4d --- a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js +++ b/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js @@ -169,15 +169,15 @@ switch (type) { case ASSIGNMENTS_CST.TYPE.SUBJECT: - metaDataService.subject.findOne(data.category_id, setCategoryToData); + metaDataService.subject.findOne(data.subject_cat_id, setCategoryToData); break; case ASSIGNMENTS_CST.TYPE.OBJECT: - metaDataService.object.findOne(data.category_id, setCategoryToData); + metaDataService.object.findOne(data.object_cat_id, setCategoryToData); break; case ASSIGNMENTS_CST.TYPE.ACTION: - metaDataService.action.findOne(data.category_id, setCategoryToData); + metaDataService.action.findOne(data.action_cat_id, setCategoryToData); break; } @@ -257,7 +257,7 @@ subject.loader = true; - assignmentsService.subject.delete(list.policy.id, subject.subject_id, subject.category_id, dataId, deleteSubSuccess, deleteSubError); + assignmentsService.subject.delete(list.policy.id, subject.subject_id, subject.subject_cat_id, dataId, deleteSubSuccess, deleteSubError); function deleteSubSuccess(data) { @@ -289,7 +289,7 @@ object.loader = true; - assignmentsService.object.delete(list.policy.id, object.object_id, object.category_id, dataId, deleteObjSuccess, deleteObjError); + assignmentsService.object.delete(list.policy.id, object.object_id, object.object_cat_id, dataId, deleteObjSuccess, deleteObjError); function deleteObjSuccess(data) { @@ -320,7 +320,7 @@ action.loader = true; - assignmentsService.action.delete(list.policy.id, action.action_id, action.category_id, dataId, deleteActSuccess, deleteActError); + assignmentsService.action.delete(list.policy.id, action.action_id, action.action_cat_id, dataId, deleteActSuccess, deleteActError); function deleteActSuccess(data) { diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-list.tpl.html old mode 100644 new mode 100755 diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.edit.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.edit.dir.js old mode 100644 new mode 100755 diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.list.dir.js old mode 100644 new mode 100755 diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-list.tpl.html old mode 100644 new mode 100755 diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.list.dir.js old mode 100644 new mode 100755 diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html old mode 100644 new mode 100755 diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js old mode 100644 new mode 100755 -- cgit 1.2.3-korg