Skip to content
Permalink
Browse files

- minor fixes

  • Loading branch information
open-lims committed Mar 26, 2017
1 parent 34f85af commit 33a23cbafb434139dc2a960018636941878d7187
@@ -1,2 +1,3 @@
/apidoc/
/logs/
/filesystem/
@@ -644,7 +644,8 @@ private static function detail_home()
if (file_exists($value['class_path']))
{
require_once($value['class_path']);
$module_settings_return = $value['class']::$value['method']($user_id);
$method = $value['method'];
$module_settings_return = $value['class']::$method($user_id);
$module_settings_array[$module_settings_counter]['title'] = Language::get_message($value['language_address'], "dialog");
$module_settings_array[$module_settings_counter]['value'] = $module_settings_return['value'];
$module_settings_array[$module_settings_counter]['params'] = $module_settings_return['params'];
@@ -378,38 +378,40 @@ public static function add_as_item_window($get_array, $type_array, $category_arr
{
$equipment_cat_array = EquipmentType::list_entries_by_cat_id($value);
if (is_array($equipment_cat_array) and count($equipment_cat_array) >= 1)
if (!is_array($equipment_cat_array))
{
if (!in_array(1, $equipment_cat_array))
{
$equipment_cat_array[] = 1;
}
if (!in_array(2, $equipment_cat_array))
{
$equipment_cat_array[] = 2;
}
$equipment_cat_array = array();
}
if (!in_array(1, $equipment_cat_array))
{
$equipment_cat_array[] = 1;
}
if (!in_array(2, $equipment_cat_array))
{
$equipment_cat_array[] = 2;
}
if (!in_array(3, $equipment_cat_array))
{
$equipment_cat_array[] = 3;
}
if (!in_array(3, $equipment_cat_array))
foreach ($equipment_cat_array as $key => $value)
{
if (!in_array($value, $hit_array))
{
$equipment_cat_array[] = 3;
$equipment_type = new EquipmentType($value);
$result[$counter]['value'] = $value;
$result[$counter]['disabled'] = "";
$result[$counter]['content'] = $equipment_type->get_name()." (".$equipment_type->get_cat_name().")";
$counter++;
array_push($hit_array, $value);
}
foreach ($equipment_cat_array as $key => $value)
{
if (!in_array($value, $hit_array))
{
$equipment_type = new EquipmentType($value);
$result[$counter]['value'] = $value;
$result[$counter]['disabled'] = "";
$result[$counter]['content'] = $equipment_type->get_name()." (".$equipment_type->get_cat_name().")";
$counter++;
array_push($hit_array, $value);
}
}
}
}
}
}
else
@@ -98,7 +98,8 @@ public static function get_menu_element($element_array, $key, $counter, $link_ba
$ajax_handling_array = $item_handling_cass::get_item_add_script_handling_class($element_array['type']);
require_once("core/modules/".$ajax_handling_array[0]);
$ajax_init_array = $ajax_handling_array[1]::$ajax_handling_array[2]($element_array['pos_id'], $paramquery, $element_array['type_id'], $element_array['category_id'], $holder_class, $holder_id);
$method = $ajax_handling_array[2];
$ajax_init_array = $ajax_handling_array[1]::$method($element_array['pos_id'], $paramquery, $element_array['type_id'], $element_array['category_id'], $holder_class, $holder_id);
$result[$counter]['script'] = $ajax_init_array['script'];
$result[$counter]['window_title'] = $ajax_init_array['window_title'];

0 comments on commit 33a23cb

Please sign in to comment.
You can’t perform that action at this time.