Changeset 7327 for extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

Timestamp:

Oct 21, 2010, 11:35:20 PM (14 years ago)

Author:

grum

Message:

fix bug on the rbuilder and ajax initialization and enhance some template & css properties

File:

• extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php (modified) (6 diffs)

extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

@@ -263 +263 @@
 
 
+load_language('rbuilder.lang', GPC_PATH);
+
 
 class GPCRequestBuilder {
@@ -490 +492 @@
     GPCCore::addHeaderJS('gpc.interface', 'plugins/'.$baseName.'external/interface/interface.js');
     GPCCore::addHeaderJS('gpc.inestedsortable', 'plugins/'.$baseName.'external/inestedsortable.pack.js');
-    GPCCore::addHeaderJS('gpc.criteriaBuilder', 'plugins/'.$baseName.'criteriaBuilder.js');
+    GPCCore::addHeaderJS('gpc.criteriaBuilder', 'plugins/'.$baseName.'criteriaBuilder.packed.js');
 
     $template->append('head_elements',
@@ -497 +499 @@
       textAND:'".l10n('gpc_rb_textAND')."',
       textOR:'".l10n('gpc_rb_textOR')."',
+      textNoCriteria:\"".l10n('There is no criteria ! At least, one criteria is required to do search...')."\",
       imgEditUrl:'',
       imgDeleteUrl:'',
@@ -909 +912 @@
         $datas['imageCategoriesDir']=explode(',', $row['imageCategoriesDir']);
 
-
         $datas['imageCategories']=Array();
         for($i=0;$i<count($datas['imageCategoriesId']);$i++)
@@ -918 +920 @@
             'dirType' => $datas['imageCategoriesDir'][$i],
             'pLinks' => $datas['imageCategoriesPLink'][$i],
-            'link'=> make_index_url(
-                              array(
-                                'category' => array(
-                                  'id' => $datas['imageCategoriesId'][$i],
-                                  'name' => $datas['imageCategoriesNames'][$i],
-                                  'permalink' => $datas['imageCategoriesPLink'][$i])
-                              )
+            'link'=> make_picture_url(
+                        array(
+                          'image_id' => $datas['imageId'],
+                          'category' => array
+                            (
+                              'id' => $datas['imageCategoriesId'][$i],
+                              'name' => $datas['imageCategoriesNames'][$i],
+                              'permalink' => $datas['imageCategoriesPLink'][$i]
                             )
+                        )
+                      )
           );
         }
@@ -1318 +1323 @@
     global $template, $lang;
 
-    load_language('rbuilder.lang', GPC_PATH);
+    //load_language('rbuilder.lang', GPC_PATH);
 
     if(is_string($filter)) $filter=array($filter);