Changeset 1753 for sandboxes/asandbox/branches/1.4/lib/filter/doctrine/apostrophePlugin/base/BaseaPageFormFilter.class.php

Timestamp:

07/14/10 12:12:43 (22 months ago)

Author:

johnnyoffline

Message:

i have some modified base classes probably from a build all

Files:

• sandboxes/asandbox/branches/1.4/lib/filter/doctrine/apostrophePlugin/base/BaseaPageFormFilter.class.php (modified) (5 diffs)

sandboxes/asandbox/branches/1.4/lib/filter/doctrine/apostrophePlugin/base/BaseaPageFormFilter.class.php

@@ -27 +27 @@
       'rgt'                   => new sfWidgetFormFilterInput(),
       'level'                 => new sfWidgetFormFilterInput(),
+      'media_categories_list' => new sfWidgetFormDoctrineChoice(array('multiple' => true, 'model' => 'aMediaCategory')),
       'blog_categories_list'  => new sfWidgetFormDoctrineChoice(array('multiple' => true, 'model' => 'aBlogCategory')),
-      'media_categories_list' => new sfWidgetFormDoctrineChoice(array('multiple' => true, 'model' => 'aMediaCategory')),
     ));
 
@@ -45 +45 @@
       'rgt'                   => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
       'level'                 => new sfValidatorSchemaFilter('text', new sfValidatorInteger(array('required' => false))),
+      'media_categories_list' => new sfValidatorDoctrineChoice(array('multiple' => true, 'model' => 'aMediaCategory', 'required' => false)),
       'blog_categories_list'  => new sfValidatorDoctrineChoice(array('multiple' => true, 'model' => 'aBlogCategory', 'required' => false)),
-      'media_categories_list' => new sfValidatorDoctrineChoice(array('multiple' => true, 'model' => 'aMediaCategory', 'required' => false)),
     ));
 
@@ -56 +56 @@
 
     parent::setup();
+  }
+
+  public function addMediaCategoriesListColumnQuery(Doctrine_Query $query, $field, $values)
+  {
+    if (!is_array($values))
+    {
+      $values = array($values);
+    }
+
+    if (!count($values))
+    {
+      return;
+    }
+
+    $query
+      ->leftJoin($query->getRootAlias().'.aMediaPageCategory aMediaPageCategory')
+      ->andWhereIn('aMediaPageCategory.media_category_id', $values)
+    ;
   }
 
@@ -73 +91 @@
       ->leftJoin($query->getRootAlias().'.aBlogPageCategory aBlogPageCategory')
       ->andWhereIn('aBlogPageCategory.blog_category_id', $values)
-    ;
-  }
-
-  public function addMediaCategoriesListColumnQuery(Doctrine_Query $query, $field, $values)
-  {
-    if (!is_array($values))
-    {
-      $values = array($values);
-    }
-
-    if (!count($values))
-    {
-      return;
-    }
-
-    $query
-      ->leftJoin($query->getRootAlias().'.aMediaPageCategory aMediaPageCategory')
-      ->andWhereIn('aMediaPageCategory.media_category_id', $values)
     ;
   }
@@ -116 +116 @@
       'rgt'                   => 'Number',
       'level'                 => 'Number',
+      'media_categories_list' => 'ManyKey',
       'blog_categories_list'  => 'ManyKey',
-      'media_categories_list' => 'ManyKey',
     );
   }