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

BugFix show PreStudent Variables instead of Person Variables in Msg

Browse Source
This commit is contained in:
Manfred Kindl
2020-02-12 09:40:19 +01:00
parent 4b3f6f109d
commit 98b2abeb51
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/messages/Messages.php
+2 -1
View File
@@ -57,9 +57,10 @@ class Messages extends Auth_Controller
$subject = $this->input->post('subject');
$body = $this->input->post('body');
$persons = $this->input->post('persons');
$prestudenten = $this->input->post('prestudenten');
$relationmessage_id = $this->input->post('relationmessage_id');
$sendImplicitTemplate = $this->CLMessagesModel->sendImplicitTemplate($persons, $subject, $body, $relationmessage_id);
$sendImplicitTemplate = $this->CLMessagesModel->sendImplicitTemplate($prestudenten, $subject, $body, $relationmessage_id);
if (isSuccess($sendImplicitTemplate))
{
$this->load->view('system/messages/htmlSuccess');
application/models/CL/Messages_model.php
+4 -1
View File
@@ -337,7 +337,7 @@ class Messages_model extends CI_Model
if (!is_numeric($sender_id)) show_error('The current logged user person_id is not defined');
// Retrieves message vars data for the given user/s
$msgVarsData = $this->MessageModel->getMsgVarsDataByPersonId($persons);
$msgVarsData = $this->MessageModel->getMsgVarsDataByPrestudentId($persons);
if (isError($msgVarsData)) show_error(getError($msgVarsData));
if (!hasData($msgVarsData)) show_error('No recipients were given');
@@ -684,6 +684,7 @@ class Messages_model extends CI_Model
$recipientsArray = array();
$recipientsList = '';
$persons = '';
$prestudenten = '';
foreach (getData($info) as $receiver)
{
$recipient = new stdClass();
@@ -702,6 +703,7 @@ class Messages_model extends CI_Model
$recipientsArray[] = $recipient;
$recipientsList .= $receiver->Vorname.' '.$receiver->Nachname.'; ';
$persons .= '<input type="hidden" name="persons[]" value="'.$receiver->person_id.'">'."\n";
$prestudenten .= '<input type="hidden" name="prestudenten[]" value="'.$receiver->prestudent_id.'">'."\n";
}
// ---------------------------------------------------------------------------------------
@@ -779,6 +781,7 @@ class Messages_model extends CI_Model
'senderIsAdmin' => getData($senderIsAdmin),
'recipientsArray' => $recipientsArray,
'persons' => $persons,
'prestudenten' => $prestudenten,
'relationmessage_id' => $relationmessage,
'type' => $type
);
application/views/system/messages/htmlWriteTemplate.php
+1
View File
@@ -163,6 +163,7 @@
</div>
<?php echo $persons; ?>
<?php echo $prestudenten; ?>
<?php echo $relationmessage_id; ?>
<?php echo $type; ?>