Changeset 1753 for sandboxes

Timestamp:

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

Author:

johnnyoffline

Message:

i have some modified base classes probably from a build all

Location:

sandboxes/asandbox/branches/1.4/lib

Files:

• filter/doctrine/apostrophePlugin/base/BaseaPageFormFilter.class.php (modified) (5 diffs)
• form/doctrine/apostrophePlugin/base/BaseaPageForm.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',
     );
   }

sandboxes/asandbox/branches/1.4/lib/form/doctrine/apostrophePlugin/base/BaseaPageForm.class.php

@@ -30 +30 @@
       'rgt'                   => new sfWidgetFormInputText(),
       'level'                 => new sfWidgetFormInputText(),
+      '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')),
     ));
 
@@ -49 +49 @@
       'rgt'                   => new sfValidatorInteger(array('required' => false)),
       'level'                 => 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)),
     ));
 
@@ -71 +71 @@
     parent::updateDefaultsFromObject();
 
+    if (isset($this->widgetSchema['media_categories_list']))
+    {
+      $this->setDefault('media_categories_list', $this->object->MediaCategories->getPrimaryKeys());
+    }
+
     if (isset($this->widgetSchema['blog_categories_list']))
     {
       $this->setDefault('blog_categories_list', $this->object->BlogCategories->getPrimaryKeys());
-    }
-
-    if (isset($this->widgetSchema['media_categories_list']))
-    {
-      $this->setDefault('media_categories_list', $this->object->MediaCategories->getPrimaryKeys());
     }
 
@@ -85 +85 @@
   protected function doSave($con = null)
   {
+    $this->saveMediaCategoriesList($con);
     $this->saveBlogCategoriesList($con);
-    $this->saveMediaCategoriesList($con);
 
     parent::doSave($con);
+  }
+
+  public function saveMediaCategoriesList($con = null)
+  {
+    if (!$this->isValid())
+    {
+      throw $this->getErrorSchema();
+    }
+
+    if (!isset($this->widgetSchema['media_categories_list']))
+    {
+      // somebody has unset this widget
+      return;
+    }
+
+    if (null === $con)
+    {
+      $con = $this->getConnection();
+    }
+
+    $existing = $this->object->MediaCategories->getPrimaryKeys();
+    $values = $this->getValue('media_categories_list');
+    if (!is_array($values))
+    {
+      $values = array();
+    }
+
+    $unlink = array_diff($existing, $values);
+    if (count($unlink))
+    {
+      $this->object->unlink('MediaCategories', array_values($unlink));
+    }
+
+    $link = array_diff($values, $existing);
+    if (count($link))
+    {
+      $this->object->link('MediaCategories', array_values($link));
+    }
   }
 
@@ -129 +167 @@
   }
 
-  public function saveMediaCategoriesList($con = null)
-  {
-    if (!$this->isValid())
-    {
-      throw $this->getErrorSchema();
-    }
-
-    if (!isset($this->widgetSchema['media_categories_list']))
-    {
-      // somebody has unset this widget
-      return;
-    }
-
-    if (null === $con)
-    {
-      $con = $this->getConnection();
-    }
-
-    $existing = $this->object->MediaCategories->getPrimaryKeys();
-    $values = $this->getValue('media_categories_list');
-    if (!is_array($values))
-    {
-      $values = array();
-    }
-
-    $unlink = array_diff($existing, $values);
-    if (count($unlink))
-    {
-      $this->object->unlink('MediaCategories', array_values($unlink));
-    }
-
-    $link = array_diff($values, $existing);
-    if (count($link))
-    {
-      $this->object->link('MediaCategories', array_values($link));
-    }
-  }
-
 }