From ae24562b67b56293aa227ad987e68deb8ec54e12 Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Tue, 7 May 2013 21:06:11 +0300 Subject: [PATCH] admin: rework reordering, allow to reorder inlines --- ipf/admin/media/css/forms.css | 3 ++ ipf/admin/modelinline.php | 47 +++++++++++++++++++++----- ipf/admin/templates/admin/change.html | 44 ++++++++++++++++-------- ipf/admin/templates/admin/items.html | 48 ++++++++++++--------------- ipf/admin/views.php | 31 +++++++++++++---- ipf/orm/record.php | 10 ------ ipf/utils.php | 21 ++++++++---- 7 files changed, 132 insertions(+), 72 deletions(-) diff --git a/ipf/admin/media/css/forms.css b/ipf/admin/media/css/forms.css index ee2ddef..2d112cf 100644 --- a/ipf/admin/media/css/forms.css +++ b/ipf/admin/media/css/forms.css @@ -69,3 +69,6 @@ fieldset.monospace textarea { font-family:"Bitstream Vera Sans Mono",Monaco,"Cou .flatpages-flatpage #id_content { height:40.2em; } .module table .vPositiveSmallIntegerField { width:2.2em; } +/* INLINE REORDER */ +.ItemsDragClass{background-color:#E3F3FE;} + diff --git a/ipf/admin/modelinline.php b/ipf/admin/modelinline.php index 87a5a31..4ab936c 100644 --- a/ipf/admin/modelinline.php +++ b/ipf/admin/modelinline.php @@ -19,6 +19,11 @@ abstract class IPF_Admin_ModelInline{ abstract function getModelName(); + public function getApplication() + { + return IPF_Utils::appByModel($this->getModelName()); + } + function getAddNum(){ return 4; } function getLegend(){ @@ -60,14 +65,28 @@ abstract class IPF_Admin_ModelInline{ $this->formset = array(); + $o = $this->_orderableColumn(); + + $form_extra = array( + 'exclude' => array( + $this->getFkName(), + $this->getFkLocal(), + ), + ); + if ($o) + $form_extra['exclude'][] = $o; + $first = true; if ($this->parentModel->exists()){ - $objects = IPF_ORM_Query::create() + $query = IPF_ORM_Query::create() ->from(get_class($this->model)) - ->orderby($this->orderby) - ->where($this->getFkLocal().'='.$this->parentModel->id) - ->execute(); + ->where($this->getFkLocal().'='.$this->parentModel->id); + + if ($o) + $objects = $query->orderby($o)->execute(); + else + $objects = $query->orderby($this->orderby)->execute(); foreach ($objects as $obj){ $prefix = 'edit_'.get_class($this->model).'_'.$obj->id.'_'; @@ -85,9 +104,7 @@ abstract class IPF_Admin_ModelInline{ } } - $form = $this->_getForm($obj, $d, - array('exclude'=>array($this->getFkName(),$this->getFkLocal())) - ); + $form = $this->_getForm($obj, $d, $form_extra); $form->prefix = $prefix; @@ -108,7 +125,7 @@ abstract class IPF_Admin_ModelInline{ $n_addnum = $this->getAddNum(); for($i=0; $i<$n_addnum; $i++ ){ - $form = $this->_getForm($this->model->copy(), null, array('exclude'=>array($this->getFkName(),$this->getFkLocal()))); + $form = $this->_getForm($this->model->copy(), null, $form_extra); $form->fields = array_merge(array(new IPF_Form_Field_Boolean(array('label'=>'Del','name'=>'delete_', 'widget_attrs'=>array('disabled'=>'disabled')))),$form->fields); $form->prefix = 'add_'.get_class($this->model).'_'.$i.'_'; $form->data = $data; @@ -171,4 +188,18 @@ abstract class IPF_Admin_ModelInline{ } } } + + public function _orderable() + { + return $this->_orderableColumn() !== null; + } + + public function _orderableColumn() + { + if ($this->model->getTable()->hasTemplate('IPF_ORM_Template_Orderable')) + return $this->model->getTable()->getTemplate('IPF_ORM_Template_Orderable')->getColumnName(); + else + return null; + } } + diff --git a/ipf/admin/templates/admin/change.html b/ipf/admin/templates/admin/change.html index 2e0f150..8cbc640 100644 --- a/ipf/admin/templates/admin/change.html +++ b/ipf/admin/templates/admin/change.html @@ -5,17 +5,6 @@ {block breadcrumbs}
Home » {$classname} » {$page_title}
{/block} {block content} - - -

{$page_title}

@@ -37,7 +26,10 @@ $(document).ready(function(){

{$inline->getLegend()}

- + _orderable()} + class="orderable-inlne" + data-url="{url 'IPF_Admin_Views_ListItems', array($inline->getApplication()->getSlug(), strtolower($inline->getModelName()))}" + {/if}> {foreach $inline.formset as $formset} {if $formset.isFirst} @@ -49,7 +41,7 @@ $(document).ready(function(){ {/if} - + {foreach $formset.fields as $fieldname=>$field} {$formset.field($fieldname).fieldErrors()}{$formset.field($fieldname)|safe} {/foreach} @@ -73,6 +65,32 @@ $(document).ready(function(){
+{/block} +{block scripts} + + {/block} diff --git a/ipf/admin/templates/admin/items.html b/ipf/admin/templates/admin/items.html index 24d1787..0574841 100644 --- a/ipf/admin/templates/admin/items.html +++ b/ipf/admin/templates/admin/items.html @@ -6,29 +6,6 @@ {block breadcrumbs}
Home » {$classname}
{/block} {block content} - -{if $orderable} - - -{/if} -

{$page_title}

@@ -92,10 +69,27 @@ $(document).ready(function()

+{/block} - - - - +{block scripts} +{if $orderable} + + +{/if} {/block} diff --git a/ipf/admin/views.php b/ipf/admin/views.php index 14dbc4f..86b47ee 100644 --- a/ipf/admin/views.php +++ b/ipf/admin/views.php @@ -169,7 +169,7 @@ function IPF_Admin_Views_Reorder($request, $match) $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; - if ($request->method != 'POST' || !isset($request->POST['ids']) || !isset($request->POST['prev_ids']) || !isset($request->POST['drop_id'])) + if ($request->method != 'POST' || !isset($request->POST['ids']) || !is_array($request->POST['ids'])) return new IPF_HTTP_Response_NotFound(); $lapp = $match[1]; @@ -188,13 +188,30 @@ function IPF_Admin_Views_Reorder($request, $match) if ($ma !==null && $ma->_orderable()) { $ord_field = $ma->_orderableColumn(); - $ids = explode(',',(string)$request->POST['ids']); - $prev_ids = explode(',',(string)$request->POST['prev_ids']); - $drop_id = $request->POST['drop_id']; + $ids = $request->POST['ids']; + + $table = IPF_ORM::getTable($m); + $conn = $table->getConnection(); + + $idColumn = $table->getIdentifier(); + if (is_array($idColumn)) + $idColumn = $idColumn[0]; + + $questions = str_repeat('?,', count($ids)-1) . '?'; + $query = 'SELECT ' . $conn->quoteIdentifier($ord_field) . + ' FROM ' . $conn->quoteIdentifier($table->getTableName()) . + ' WHERE ' . $conn->quoteIdentifier($idColumn) . ' IN (' . $questions . ')' . + ' ORDER BY ' . $conn->quoteIdentifier($ord_field); + $ords = $conn->fetchColumn($query, $ids); + + $i = 0; + foreach ($ids as $id) { + $item = $table->find($id); + $item[$ord_field] = $ords[$i]; + $item->save(); + $i++; + } - $o = new $m(); - $o->_reorder($ids, $ord_field, $drop_id, $prev_ids); - return new IPF_HTTP_Response_Json("Ok"); } } diff --git a/ipf/orm/record.php b/ipf/orm/record.php index 3510d9d..ec67315 100644 --- a/ipf/orm/record.php +++ b/ipf/orm/record.php @@ -1303,15 +1303,5 @@ abstract class IPF_ORM_Record extends IPF_ORM_Record_Abstract implements Countab return $this->_custom[$name]; return null; } - - public function _reorder($ids, $ord_field, $drop_id, $prev_ids, $ord=1) - { - foreach($ids as $id) { - $item = $this->getTable()->find($id); - $item[$ord_field] = $ord; - $item->save(); - $ord++; - } - } } diff --git a/ipf/utils.php b/ipf/utils.php index 040e45f..bda6deb 100644 --- a/ipf/utils.php +++ b/ipf/utils.php @@ -131,15 +131,22 @@ class IPF_Utils return $date2 - $date1; } + static function appByModel($model) + { + foreach (IPF_Project::getInstance()->appList() as $app) + foreach ($app->modelList() as $m) + if ($model == $m) + return $app; + return null; + } + static function appLabelByModel($model) { - foreach (IPF_Project::getInstance()->appList() as $app) { - foreach($app->modelList() as $m) { - if ($model==$m) - return strtolower($app->getLabel()); - } - } - return ''; + $app = self::appByModel($model); + if ($app) + return strtolower($app->getLabel()); + else + return ''; } public static function insertDirectory($path, $directory) -- 2.49.0