From b364cfae06348790fec1e7b84fd3ba8917e0b65a Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 19 Jun 2019 15:29:17 +0200 Subject: [PATCH] - Moved controllers FASMessages and Messages to system/messages/ - Adapted code to use the new path --- application/controllers/system/{ => messages}/FASMessages.php | 0 application/controllers/system/{ => messages}/Messages.php | 0 application/models/CL/Messages_model.php | 2 +- application/views/system/infocenter/stammdaten.php | 2 +- application/views/system/messages/htmlWriteTemplate.php | 2 +- content/fasoverlay.js.php | 2 +- content/messages.js.php | 4 ++-- public/js/infocenter/infocenterDetails.js | 2 +- public/js/infocenter/infocenterPersonDataset.js | 2 +- public/js/infocenter/messageList.js | 2 +- public/js/messaging/messageWrite.js | 4 ++-- 11 files changed, 11 insertions(+), 11 deletions(-) rename application/controllers/system/{ => messages}/FASMessages.php (100%) rename application/controllers/system/{ => messages}/Messages.php (100%) diff --git a/application/controllers/system/FASMessages.php b/application/controllers/system/messages/FASMessages.php similarity index 100% rename from application/controllers/system/FASMessages.php rename to application/controllers/system/messages/FASMessages.php diff --git a/application/controllers/system/Messages.php b/application/controllers/system/messages/Messages.php similarity index 100% rename from application/controllers/system/Messages.php rename to application/controllers/system/messages/Messages.php diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php index 33bc90e80..302e51340 100644 --- a/application/models/CL/Messages_model.php +++ b/application/models/CL/Messages_model.php @@ -283,7 +283,7 @@ class Messages_model extends CI_Model } //------------------------------------------------------------------------------------------------------------------ - // Public methods called by controller system/Messages + // Public methods called by controller system/messages/Messages /** * Returns an object that represent a template store in database diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php index ebd812c6a..a80439bfe 100644 --- a/application/views/system/infocenter/stammdaten.php +++ b/application/views/system/infocenter/stammdaten.php @@ -113,7 +113,7 @@
-
+  p->t('ui','nachrichtSenden'); ?> diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php index 8ce4d670a..f46138e28 100644 --- a/application/views/system/messages/htmlWriteTemplate.php +++ b/application/views/system/messages/htmlWriteTemplate.php @@ -29,7 +29,7 @@
- +
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php index 3089b6032..2fafb5ea8 100644 --- a/content/fasoverlay.js.php +++ b/content/fasoverlay.js.php @@ -1250,7 +1250,7 @@ function MessageNew() { var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id'); - var action = 'index.ci.php/system/FASMessages/writeTemplate/' + person_id; ?>; + var action = 'index.ci.php/system/messages/FASMessages/writeTemplate/' + person_id; ?>; openWindowPostArray(action, 'prestudent_id', prestudentIdArray); } diff --git a/content/messages.js.php b/content/messages.js.php index 4094cddb8..3e72748ec 100644 --- a/content/messages.js.php +++ b/content/messages.js.php @@ -104,7 +104,7 @@ function MessagesNewMessage() { var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id'); - var action = 'index.ci.php/system/FASMessages/writeTemplate'; + var action = 'index.ci.php/system/messages/FASMessages/writeTemplate'; openWindowPostArray(action, 'prestudent_id', prestudentIdArray); } @@ -128,7 +128,7 @@ function MessagesSendAnswer() var RecipientID = getTreeCellText(messagesTree, 'messages-tree-recipient_id', messagesTree.currentIndex); var prestudentIdArray = new Array(getTreeCellText(studentsTree, 'student-treecol-prestudent_id', studentsTree.currentIndex)); - var action = 'index.ci.php/system/FASMessages/writeReplyTemplate/' + MessageId + '/' + RecipientID; + var action = 'index.ci.php/system/messages/FASMessages/writeReplyTemplate/' + MessageId + '/' + RecipientID; openWindowPostArray(action, 'prestudent_id', prestudentIdArray); } diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js index 3edb9d42d..60da695d2 100644 --- a/public/js/infocenter/infocenterDetails.js +++ b/public/js/infocenter/infocenterDetails.js @@ -629,7 +629,7 @@ var InfocenterDetails = { sendFreigabeMessage: function(prestudentid, vorlage_kurzbz, msgvars) { FHC_AjaxClient.ajaxCallPost( - 'system/Messages/sendExplicitTemplateJson', + 'system/messages/Messages/sendExplicitTemplateJson', { "prestudents": prestudentid, "vorlage_kurzbz": vorlage_kurzbz, diff --git a/public/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js index c5ea99dfc..07163ccee 100644 --- a/public/js/infocenter/infocenterPersonDataset.js +++ b/public/js/infocenter/infocenterPersonDataset.js @@ -26,7 +26,7 @@ var InfocenterPersonDataset = { appendTableActionsHtml: function() { var currurl = window.location.href; - var url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/Messages/writeTemplate"; + var url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/messages/Messages/writeTemplate"; var formHtml = ''; $("#datasetActionsTop").before(formHtml); diff --git a/public/js/infocenter/messageList.js b/public/js/infocenter/messageList.js index 85d5ad603..6146c7639 100644 --- a/public/js/infocenter/messageList.js +++ b/public/js/infocenter/messageList.js @@ -54,7 +54,7 @@ var MessageList = { var recid = id.substr(id.indexOf('_') + 1); FHC_AjaxClient.ajaxCallGet( - 'system/Messages/getMessageFromIds', + 'system/messages/Messages/getMessageFromIds', { "msg_id": msgid, "receiver_id": recid diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js index c496b269d..4146b7008 100644 --- a/public/js/messaging/messageWrite.js +++ b/public/js/messaging/messageWrite.js @@ -20,7 +20,7 @@ function tinymcePreviewSetContent() function parseMessageText(receiver_id, text) { FHC_AjaxClient.ajaxCallGet( - "system/Messages/parseMessageText", + "system/messages/Messages/parseMessageText", { person_id: receiver_id, text: text @@ -111,7 +111,7 @@ $(document).ready(function () if (vorlage_kurzbz != '') { FHC_AjaxClient.ajaxCallGet( - "system/Messages/getVorlage", + "system/messages/Messages/getVorlage", { vorlage_kurzbz: vorlage_kurzbz },