[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14649] more on bookingfrontend
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14649] more on bookingfrontend |
Date: |
Fri, 15 Jan 2016 09:52:51 +0000 |
Revision: 14649
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14649
Author: sigurdne
Date: 2016-01-15 09:52:50 +0000 (Fri, 15 Jan 2016)
Log Message:
-----------
more on bookingfrontend
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.custom_fields.inc.php
branches/dev-syncromind/bookingfrontend/js/bookingfrontend/search.js
branches/dev-syncromind/phpgwapi/inc/class.custom_fields.inc.php
Modified: branches/dev-syncromind/booking/inc/class.custom_fields.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.custom_fields.inc.php
2016-01-14 15:25:46 UTC (rev 14648)
+++ branches/dev-syncromind/booking/inc/class.custom_fields.inc.php
2016-01-15 09:52:50 UTC (rev 14649)
@@ -131,8 +131,8 @@
*
* @return array the grouped attributes
*/
- private function get_field_groups($appname, $location, $fields
= array())
+ private function get_field_groups($appname, $location, $fields
= array(), $skip_no_group = false)
{
- return parent::get_attribute_groups($appname,
$location, $fields, true);
+ return parent::get_attribute_groups($appname,
$location, $fields, $skip_no_group);
}
}
\ No newline at end of file
Modified: branches/dev-syncromind/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- branches/dev-syncromind/bookingfrontend/js/bookingfrontend/search.js
2016-01-14 15:25:46 UTC (rev 14648)
+++ branches/dev-syncromind/bookingfrontend/js/bookingfrontend/search.js
2016-01-15 09:52:50 UTC (rev 14649)
@@ -99,10 +99,11 @@
{
//Find top node
var top_node_id = parents[(level - 2)];
-
var treeInst = $('#treeDiv1').jstree(true);
top_node = treeInst.get_node(top_node_id)
-// activity_top_level =
top_node.a_attr.activity_top_level;
+ activity_location =
top_node.original.activity_location;
+ $("#" + activity_location).prop( "checked",
true );
+
}
}
// else
@@ -113,7 +114,6 @@
// $("#" + activity_location).prop( "checked",
false );
// }
// }
-// $('#activity_top_level').val(activity_top_level);
// var href = data.node.a_attr.href;
// if (href == "#")
Modified: branches/dev-syncromind/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.custom_fields.inc.php
2016-01-14 15:25:46 UTC (rev 14648)
+++ branches/dev-syncromind/phpgwapi/inc/class.custom_fields.inc.php
2016-01-15 09:52:50 UTC (rev 14649)
@@ -1535,28 +1535,43 @@
$this->node_id++;
}
- foreach($tree as &$node)
+ if($tree)
{
- $children =
$this->get_group_children($location_id, $node['db_id'], $node['db_id'],
$cat_id);
- $attribute_children =
$this->get_attribute_children($location_id, $node['id'], $node['db_id'],
$cat_id);
- if($children)
+ foreach($tree as &$node)
{
- $node['children'] = $children;
- }
-
- if($attribute_children)
- {
+ $children =
$this->get_group_children($location_id, $node['db_id'], $node['db_id'],
$cat_id);
+ $attribute_children =
$this->get_attribute_children($location_id, $node['id'], $node['db_id'],
$cat_id);
if($children)
{
- $node['children'] =
array_merge($children, $attribute_children);
+ $node['children'] = $children;
}
- else
+
+ if($attribute_children)
{
- $node['children'] =
$attribute_children;
+ if($children)
+ {
+ $node['children'] =
array_merge($children, $attribute_children);
+ }
+ else
+ {
+ $node['children'] =
$attribute_children;
+ }
}
}
-
}
+ else
+ {
+ $tree =
$this->get_attribute_children($location_id, "ajson{$this->node_id}", 0,
$cat_id);
+ $this->node_id++;
+ foreach($tree as &$node)
+ {
+ $children =
$this->get_attribute_children($location_id, $node['id'], $node['db_id'],
$cat_id);
+ if($children)
+ {
+ $node['children'] = $children;
+ }
+ }
+ }
return $tree;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14649] more on bookingfrontend,
Sigurd Nes <=