Changeset 15823 for trunk/modules

Timestamp:

01/04/12 05:02:30 (5 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2699

Location:

trunk/modules/boonex

Files:

• events/classes/BxEventsSearchResult.php (modified) (2 diffs)
• groups/classes/BxGroupsSearchResult.php (modified) (3 diffs)
• store/classes/BxStoreSearchResult.php (modified) (3 diffs)

trunk/modules/boonex/events/classes/BxEventsSearchResult.php

@@ -43 +43 @@
             'owner' => array('value' => '', 'field' => 'ResponsibleID', 'operator' => '='),
             'tag' => array('value' => '', 'field' => 'Tags', 'operator' => 'against'),
-            'category' => array('value' => '', 'field' => 'Category', 'operator' => '='),
+            'category' => array('value' => '', 'field' => 'Category', 'operator' => '=', 'table' => 'sys_categories'),
+            'category_type' => array('value' => '', 'field' => 'Type', 'operator' => '=', 'table' => 'sys_categories'),
             'country' => array('value' => '', 'field' => 'Country', 'operator' => '='),
             'public' => array('value' => '', 'field' => 'allow_view_event_to', 'operator' => '='),
@@ -189 +190 @@
                     'joinFields' => '',
                 );
+                $this->aCurrent['restriction']['category_type']['value'] = $this->aCurrent['name'];
                 $this->aCurrent['restriction']['category']['value'] = $sValue;
-                $this->aCurrent['restriction']['category']['table'] = 'sys_categories';
                 $sValue = $GLOBALS['MySQL']->unescape($sValue);
                 $this->sBrowseUrl = "browse/category/" . title2uri($sValue);

trunk/modules/boonex/groups/classes/BxGroupsSearchResult.php

@@ -46 +46 @@
             'tag' => array('value' => '', 'field' => 'tags', 'operator' => 'against'),
             'category' => array('value' => '', 'field' => 'Category', 'operator' => '=', 'table' => 'sys_categories'),
+            'category_type' => array('value' => '', 'field' => 'Type', 'operator' => '=', 'table' => 'sys_categories'),
             'public' => array('value' => '', 'field' => 'allow_view_group_to', 'operator' => '='),
         ),
@@ -103 +104 @@
                     );
 
+                    $this->aCurrent['restriction']['category_type']['value'] = $this->aCurrent['name']; 
                     $this->aCurrent['restriction']['category']['value'] = $sValue2;
                     if (is_array($sValue2)) {
@@ -197 +199 @@
                     'joinFields' => '',
                 );
+                $this->aCurrent['restriction']['category_type']['value'] = $this->aCurrent['name'];
                 $this->aCurrent['restriction']['category']['value'] = $sValue;
                 $sValue = $GLOBALS['MySQL']->unescape($sValue);

trunk/modules/boonex/store/classes/BxStoreSearchResult.php

@@ -44 +44 @@
             'tag' => array('value' => '', 'field' => 'tags', 'operator' => 'against'),
             'category' => array('value' => '', 'field' => 'Category', 'operator' => '=', 'table' => 'sys_categories'),
+            'category_type' => array('value' => '', 'field' => 'Type', 'operator' => '=', 'table' => 'sys_categories'),
             'public' => array('value' => '', 'field' => 'allow_view_product_to', 'operator' => '='),
         ),
@@ -100 +101 @@
                         'joinFields' => '',
                     );
-
+                    $this->aCurrent['restriction']['category_type']['value'] = $this->aCurrent['name'];
                     $this->aCurrent['restriction']['category']['value'] = $sValue2;
                     if (is_array($sValue2)) {
@@ -148 +149 @@
                     'joinFields' => '',
                 );
+                $this->aCurrent['restriction']['category_type']['value'] = $this->aCurrent['name'];
                 $this->aCurrent['restriction']['category']['value'] = $sValue;
                 $sValue = $GLOBALS['MySQL']->unescape($sValue);