mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 12:19:28 +00:00
Messages im FAS werden nach Datum sortiert anstatt nach Betreff
This commit is contained in:
@@ -10,19 +10,19 @@ class Messages extends VileSci_Controller
|
||||
*
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
// Loads the message library
|
||||
$this->load->library('MessageLib');
|
||||
// Loads the message library
|
||||
$this->load->library('MessageLib');
|
||||
|
||||
// Loads the widget library
|
||||
// Loads the widget library
|
||||
$this->load->library('WidgetLib');
|
||||
|
||||
$this->load->model('person/Person_model', 'PersonModel');
|
||||
|
||||
$this->_setAuthUID(); // sets property uid
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* write
|
||||
|
||||
@@ -746,8 +746,8 @@ class MessageLib
|
||||
$this->ci->BenutzerfunktionModel->addJoin('public.tbl_benutzer', 'uid');
|
||||
// Get all the valid receivers id using the oe_kurzbz
|
||||
$receivers = $this->ci->BenutzerfunktionModel->loadWhere(
|
||||
'oe_kurzbz = \''.$oe_kurzbz.'\''.
|
||||
' AND funktion_kurzbz = \''.$this->ci->config->item('assistent_function').'\''.
|
||||
'oe_kurzbz = '.$this->ci->db->escape($oe_kurzbz).
|
||||
' AND funktion_kurzbz = '.$this->ci->db->escape($this->ci->config->item('assistent_function')).
|
||||
' AND (NOW() BETWEEN COALESCE(datum_von, NOW()) AND COALESCE(datum_bis, NOW()))'
|
||||
);
|
||||
|
||||
|
||||
@@ -86,8 +86,6 @@ echo ']>
|
||||
<treecols>
|
||||
<treecol id="messages-tree-betreff" label="Betreff" flex="2" hidden="false" primary="true"
|
||||
class="sortDirectionIndicator"
|
||||
sortActive="true"
|
||||
sortDirection="ascending"
|
||||
sort="rdf:http://www.technikum-wien.at/messages/rdf#subject"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="messages-tree-body" label="Body" flex="2" hidden="true"
|
||||
@@ -100,6 +98,8 @@ echo ']>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="messages-tree-insertamum" label="Datum" flex="2" hidden="false"
|
||||
class="sortDirectionIndicator"
|
||||
sortActive="true"
|
||||
sortDirection="descending"
|
||||
sort="rdf:http://www.technikum-wien.at/messages/rdf#insertamum"/>
|
||||
<splitter class="tree-splitter"/>
|
||||
<treecol id="messages-tree-sender" label="Sender" flex="2" hidden="false"
|
||||
|
||||
Reference in New Issue
Block a user