blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added new directory application/views/system/messages/

Browse Source 
- Moved application/views/system/message* to application/views/system/messages/
- Adapted code to use those views with the new path
- Fixed function getCode in public/js/AjaxLib.js
- In public/js/messaging/messageWrite.js is now used AjaxLib.js
- Changed method parseMessageText in MessageLib.php to replace the keys of the data parameter
- Removed function write from application/controllers/system/Phrases.php
- Adapted code in application/controllers/system/Messages.php to use the changed method parseMessageText in MessageLib.php and path of the moved views
This commit is contained in:
Paolo
2019-02-06 18:18:57 +01:00
parent e25034560f
commit 91fbabde6f
13 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/AjaxLib.js
+1 -4
View File
@@ -146,10 +146,7 @@ var FHC_AjaxClient = {
if (jQuery.type(response) == "object" && response.hasOwnProperty(CODE))
{
if (response.error == SUCCESS)
{
isSuccess = true;
}
code = response.error;
}
return code;
public/js/messaging/messageWrite.js
+36 -26
View File
@@ -1,4 +1,6 @@
const CONTROLLER_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/system/Messages";
/**
* JS used by view system/messages/messageWrite
*/
function tinymcePreviewSetContent()
{
@@ -17,22 +19,26 @@ function tinymcePreviewSetContent()
function parseMessageText(receiver_id, text)
{
$.ajax({
dataType: "json",
url: CONTROLLER_URL + "/parseMessageText",
data: {
"person_id": receiver_id,
"text": text
},
success: function(data, textStatus, jqXHR)
FHC_AjaxClient.ajaxCallGet(
"system/Messages/parseMessageText",
{
tinyMCE.get("tinymcePreview").setContent(data);
person_id: receiver_id,
text: text
},
error: function(jqXHR, textStatus, errorThrown)
{
alert(textStatus + " - " + errorThrown + " - " + jqXHR.responseText);
successCallback: function(data, textStatus, jqXHR) {
if (FHC_AjaxClient.hasData(data))
{
tinyMCE.get("tinymcePreview").setContent(FHC_AjaxClient.getData(data));
}
else if (FHC_AjaxClient.isError(data))
{
alert(data.retval);
}
}
}
});
);
}
$(document).ready(function ()
@@ -100,24 +106,28 @@ $(document).ready(function ()
{
$("#vorlageDnD").change(function ()
{
if (this.value != '')
var vorlage_kurzbz = this.value;
if (vorlage_kurzbz != '')
{
$.ajax({
dataType: "json",
url: CONTROLLER_URL + "/getVorlage",
data: {
"vorlage_kurzbz": this.value
},
success: function(data, textStatus, jqXHR)
FHC_AjaxClient.ajaxCallGet(
"system/Messages/getVorlage",
{
tinyMCE.get("bodyTextArea").setContent(data.retval[0].text);
$("#subject").val(data.retval[0].subject);
vorlage_kurzbz: vorlage_kurzbz
},
error: function(jqXHR, textStatus, errorThrown)
{
alert(textStatus + " - " + errorThrown);
successCallback: function(data, textStatus, jqXHR) {
if (FHC_AjaxClient.hasData(data))
{
var msg = FHC_AjaxClient.getData(data);
tinyMCE.get("bodyTextArea").setContent(msg[0].text);
$("#subject").val(msg[0].subject);
}
}
}
});
);
}
});
}