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

- Splitted Usersfilters_widget in:

Browse Source 
- Aufnahmegruppe_widget
	- Reihungstest_widget
	- Studiengang_widget
	- Studiensemester_widget
	- Stufe_widget
- Renamed /system/Users controller to system/aufnahme/PrestudentMultiAssign
- Added method getPrestudentMultiAssign to Prestudent_model
- Changed WidgetLib to allow to set the name and the id html attributes
of a widget
This commit is contained in:
Paolo
2017-03-24 16:39:50 +01:00
parent 60ff6d145d
commit 1f65f7737c
18 changed files with 896 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/WidgetLib.php
+41 -3
View File
@@ -181,7 +181,8 @@ class WidgetLib
* @param array $data
* @return Widget
*/
public function widget($name, $data = array()) {
public function widget($name, $data = array(), $htmlArgs = array())
{
$class = str_replace('.php', '', trim($name, '/'));
// determine path and widget class name
@@ -208,7 +209,7 @@ class WidgetLib
show_error("Widget '" . $class . "' was not found.");
}
return new $class($class, $data);
return new $class($class, $data, $htmlArgs);
}
/**
@@ -333,6 +334,7 @@ class WidgetLib
class Partial
{
const HTML_DEFAULT_VALUE = ''; // Default value of the html element
protected $_ci, $_content, $_name, $_cache_ttl = 0, $_cached = false, $_identifier, $_trigger;
protected $_args = array();
@@ -341,10 +343,17 @@ class Partial
* Construct with optional parameters
* @param array $args
*/
public function __construct($name, $args = array()) {
public function __construct($name, $args = array(), $htmlArgs = array())
{
$this->_ci = &get_instance();
$this->_args = $args;
$this->_name = $name;
// Initialising properties
$this->_setHtmlProperties($htmlArgs);
// Loads helper message to manage returning messages
$this->load->helper('message');
}
/**
@@ -598,6 +607,35 @@ class Partial
$this->_trigger = FALSE;
}
}
/**
* Initialising properties
*/
private function _setHtmlProperties($htmlArgs)
{
if (isset($htmlArgs) && is_array($htmlArgs))
{
$this->_args['html'] = array();
if (!isset($htmlArgs['id']) || (isset($htmlArgs['id']) && $htmlArgs['id'] == ''))
{
$this->_args['html']['id'] = '';
}
else
{
$this->_args['html']['id'] = $htmlArgs['id'];
}
if (!isset($htmlArgs['name']) || (isset($htmlArgs['name']) && $htmlArgs['name'] == ''))
{
$this->_args['html']['name'] = '';
}
else
{
$this->_args['html']['name'] = $htmlArgs['name'];
}
}
}
}
class Widget extends Partial