Changeset 31813
- Timestamp:
- 01/12/11 18:52:14 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/sfDoctrineJQueryUISortablePlugin/trunk/lib/widget/sfWidgetFormDoctrineJQueryUISortable.class.php
r27009 r31813 21 21 22 22 $this->addRequiredOption('model'); 23 $this->addRequiredOption('parent_object'); 24 23 $this->addRequiredOption('parent_object'); 25 24 $this->addOption('method', '__toString'); 26 25 $this->addOption('key_method', 'getPrimaryKey'); 27 26 $this->addOption('parent_key_method', 'getPrimaryKey'); 28 27 $this->addOption('order_by', null); 28 $this->addOption('parent_super_class', null); 29 29 $this->addOption('query', null); 30 30 $this->addOption('table_method', null); … … 54 54 } 55 55 $objects = $query->execute(); 56 56 57 } 57 58 else 58 59 { 59 60 $tableMethod = $this->getOption('table_method'); 60 61 61 62 $results = is_array($tableMethod) 62 63 ? call_user_func_array(array(Doctrine::getTable($this->getOption('model')), $tableMethod[0]), $tableMethod[1]) 63 64 : Doctrine::getTable($this->getOption('model'))->$tableMethod(); 64 65 66 65 67 if ($results instanceof Doctrine_Query) 66 68 { … … 135 137 private function getJavascript() 136 138 { 139 137 140 $parentKeyMethod = $this->getOption('parent_key_method'); 138 141 $routing = sfContext::getInstance()->getRouting(); … … 145 148 'rank_field' => $this->getOption('rank_field'), 146 149 'parent_model' => get_class($this->getOption('parent_object')), 147 'parent_id' => $this->getOption('parent_object')->$parentKeyMethod() 150 'parent_id' => $this->getOption('parent_object')->$parentKeyMethod(), 151 'parent_super_class' => $this->getOption('parent_super_class'), 148 152 ) 149 153 ); plugins/sfDoctrineJQueryUISortablePlugin/trunk/modules/sfDoctrineJQueryUISortable/actions/actions.class.php
r27009 r31813 8 8 $order = 'sfDoctrineJQueryUISortable' . $model; 9 9 $parentModel = $request->getParameter('parent_model'); 10 if($request->getParameter('parent_super_class')) 11 { 12 $parentModel = $request->getParameter('parent_super_class'); 13 } 10 14 $parentId = $request->getParameter('parent_id'); 11 15 12 16 if (empty($model) || empty($order) || empty($parentModel) || empty($parentId) 13 17 || !is_array($request->getParameter($order))) … … 18 22 foreach ($request->getParameter($order) as $rank => $objectId) 19 23 { 24 20 25 $query = Doctrine_Query::create() 21 26 ->from($model . ' m')
