blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Moved controllers FASMessages and Messages to system/messages/

Browse Source 
- Adapted code to use the new path
This commit is contained in:
Paolo
2019-06-19 15:29:17 +02:00
parent 99570978c3
commit b364cfae06
11 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/FASMessages.php → application/controllers/system/messages/FASMessages.php
View File
application/controllers/system/Messages.php → application/controllers/system/messages/Messages.php
View File
application/models/CL/Messages_model.php
+1 -1
View File
@@ -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
application/views/system/infocenter/stammdaten.php
+1 -1
View File
@@ -113,7 +113,7 @@
</table>
<div class="row">
<div class="col-xs-6">
<form id="sendmsgform" method="post" action="<?php echo site_url('/system/Messages/writeTemplate'); ?>" target="_blank">
<form id="sendmsgform" method="post" action="<?php echo site_url('/system/messages/Messages/writeTemplate'); ?>" target="_blank">
<input type="hidden" name="person_id" value="<?php echo $stammdaten->person_id ?>">
<a id="sendmsglink" href="javascript:void(0);">
<i class="fa fa-envelope"></i>&nbsp;<?php echo $this->p->t('ui','nachrichtSenden'); ?>
application/views/system/messages/htmlWriteTemplate.php
+1 -1
View File
@@ -29,7 +29,7 @@
</h3>
</div>
</div>
<form id="sendForm" method="post" action="<?php echo site_url('/system/Messages/sendImplicitTemplate'); ?>">
<form id="sendForm" method="post" action="<?php echo site_url('/system/messages/Messages/sendImplicitTemplate'); ?>">
<div class="row">
<div class="form-group">
<div class="col-lg-1 msgfieldcol-left">
content/fasoverlay.js.php
+1 -1
View File
@@ -1250,7 +1250,7 @@ function MessageNew()
{
var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
var action = '<?php echo APP_ROOT ?>index.ci.php/system/FASMessages/writeTemplate/' + <?php echo $benutzer->person_id; ?>;
var action = '<?php echo APP_ROOT ?>index.ci.php/system/messages/FASMessages/writeTemplate/' + <?php echo $benutzer->person_id; ?>;
openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
}
content/messages.js.php
+2 -2
View File
@@ -104,7 +104,7 @@ function MessagesNewMessage()
{
var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
var action = '<?php echo APP_ROOT ?>index.ci.php/system/FASMessages/writeTemplate';
var action = '<?php echo APP_ROOT ?>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 = '<?php echo APP_ROOT ?>index.ci.php/system/FASMessages/writeReplyTemplate/' + MessageId + '/' + RecipientID;
var action = '<?php echo APP_ROOT ?>index.ci.php/system/messages/FASMessages/writeReplyTemplate/' + MessageId + '/' + RecipientID;
openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
}
public/js/infocenter/infocenterDetails.js
+1 -1
View File
@@ -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,
public/js/infocenter/infocenterPersonDataset.js
+1 -1
View File
@@ -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 = '<form id="sendMsgsForm" method="post" action="'+ url +'" target="_blank"></form>';
$("#datasetActionsTop").before(formHtml);
public/js/infocenter/messageList.js
+1 -1
View File
@@ -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
public/js/messaging/messageWrite.js
+2 -2
View File
@@ -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
},