Index: trunk/kernel/units/relationship/relationship_event_handler.php
===================================================================
diff -u -r4689 -r4722
--- trunk/kernel/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 4689)
+++ trunk/kernel/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 4722)
@@ -160,12 +160,11 @@
 		 */
 		function extractModulesInfo()
 		{
-			// 1. get installed modules & their config info
-			$db =& $this->Application->GetADODBConnection();
-			$prefixes = $db->GetCol('SELECT Var FROM '.TABLE_PREFIX.'Modules');
+			// get installed modules & their config info
+			// maybe we should leave only prefixes, that have "view" permission
 			$configs = Array();
-			foreach($prefixes as $prefix)
-			{
+			foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
+				$prefix = $module_data['Var'];
 				$configs[$prefix] = $this->Application->getUnitOptions($prefix);
 				if($configs[$prefix] === false) unset($configs[$prefix]);
 			}
Index: trunk/kernel/admin_templates/xml/tree_categories.tpl
===================================================================
diff -u -r4464 -r4722
--- trunk/kernel/admin_templates/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 4464)
+++ trunk/kernel/admin_templates/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 4722)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink index_file="browse.php" template="catalog" pass="m"/>" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink index_file="browse.php" template="catalog" pass="m"/>" onclick="checkEditMode()" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:"/>
Index: trunk/core/units/relationship/relationship_event_handler.php
===================================================================
diff -u -r4689 -r4722
--- trunk/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 4689)
+++ trunk/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 4722)
@@ -160,12 +160,11 @@
 		 */
 		function extractModulesInfo()
 		{
-			// 1. get installed modules & their config info
-			$db =& $this->Application->GetADODBConnection();
-			$prefixes = $db->GetCol('SELECT Var FROM '.TABLE_PREFIX.'Modules');
+			// get installed modules & their config info
+			// maybe we should leave only prefixes, that have "view" permission
 			$configs = Array();
-			foreach($prefixes as $prefix)
-			{
+			foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
+				$prefix = $module_data['Var'];
 				$configs[$prefix] = $this->Application->getUnitOptions($prefix);
 				if($configs[$prefix] === false) unset($configs[$prefix]);
 			}
Index: trunk/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -r4464 -r4722
--- trunk/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 4464)
+++ trunk/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 4722)
@@ -1,6 +1,6 @@
 <inp2:m_XMLTemplate/>
 <inp2:m_DefineElement name="category">
-	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink index_file="browse.php" template="catalog" pass="m"/>" load_url="<inp2:CategoryLink pass="m"/>"></folder>
+	<folder name="<inp2:Field name="Name"/>" icon="<inp2:c_ModulePath/>img/icons/icon24_catalog.gif" href="<inp2:CategoryLink index_file="browse.php" template="catalog" pass="m"/>" onclick="checkEditMode()" load_url="<inp2:CategoryLink pass="m"/>"></folder>
 </inp2:m_DefineElement>
 <tree>
 <inp2:c_ListCategories render_as="category" row_start_render_as="html:" row_end_render_as="html:"/>