|
From: Ivan1986 <iva...@us...> - 2011-01-21 21:21:47
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".
The branch, master has been updated
via 5fa1d8f23e0ec33fe521dd60bfd5c97604f9d6b5 (commit)
via 26b0b87b199910f5d647b9149cd2e698c1036884 (commit)
via 0895cd4eaca51491b2ced2c2136ccb18a86c984a (commit)
via b7728f97fdffbc4a9026861cbac47a73a629eaab (commit)
from d5b36acee01ffaeb1dbdc7d956ad4c852e53d522 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5fa1d8f23e0ec33fe521dd60bfd5c97604f9d6b5
Author: Ivan Borzenkov <iva...@li...>
Date: Fri Jan 21 18:18:23 2011 +0300
Ошибка в скафолде
diff --git a/lib/Modules/Scaffold/scaffold/edit.php b/lib/Modules/Scaffold/scaffold/edit.php
index 8fe2e49..14358d8 100644
--- a/lib/Modules/Scaffold/scaffold/edit.php
+++ b/lib/Modules/Scaffold/scaffold/edit.php
@@ -1,6 +1,6 @@
<?php require dirname(__FILE__).'/info.php' ?>
<?php echo $this->block(Url::C('preForm'), $id); ?>
-<form class="scaffoldEdit" action="<?php echo Url::C('edit/-1') ?>"
+<form class="scaffoldEdit" action="<?php echo Url::C('edit/'.$id) ?>"
method="post" id="form_<?php echo $table ?>" enctype="multipart/form-data">
<?php echo $this->block(Url::C('preEdit'), $id); ?>
<dl>
commit 26b0b87b199910f5d647b9149cd2e698c1036884
Author: Ivan Borzenkov <iva...@li...>
Date: Fri Jan 21 14:00:08 2011 +0300
Фикс мультиедита с селектами
diff --git a/lib/Modules/Scaffold/ScaffoldController.php b/lib/Modules/Scaffold/ScaffoldController.php
index ec52a97..7582a3c 100644
--- a/lib/Modules/Scaffold/ScaffoldController.php
+++ b/lib/Modules/Scaffold/ScaffoldController.php
@@ -468,13 +468,9 @@ abstract class ScaffoldController extends Controller
$state = new TemplaterState(QFW::$view);
QFW::$view->setScriptPath(dirname(__FILE__));
- $foreign = $this->getForeign();
- $data = QFW::$db->select('SELECT ?# AS ARRAY_KEY, ?# ?s FROM ?# ?s
- WHERE ?# IN (?a) ?s',
+ $data = QFW::$db->select('SELECT ?# AS ARRAY_KEY, ?# FROM ?# WHERE ?# IN (?a) ?s',
$this->primaryKey, array($this->table=>array_merge($this->order, array('*'))),
- $foreign['field'], $this->table, $foreign['join'],
- $this->primaryKey, $ids,
- $this->getSort());
+ $this->table, $this->primaryKey, $ids, $this->getSort());
return QFW::$view->assign(array(
'data' => $data,
))->fetch('scaffold/multiedit.php');
commit 0895cd4eaca51491b2ced2c2136ccb18a86c984a
Author: Ivan Borzenkov <iva...@li...>
Date: Fri Jan 21 13:34:01 2011 +0300
Правки скафолдинга
diff --git a/lib/Modules/Scaffold/ScaffoldController.php b/lib/Modules/Scaffold/ScaffoldController.php
index 4c21851..ec52a97 100644
--- a/lib/Modules/Scaffold/ScaffoldController.php
+++ b/lib/Modules/Scaffold/ScaffoldController.php
@@ -127,6 +127,9 @@ abstract class ScaffoldController extends Controller
*/
public function __construct()
{
+ //инициализация FormPersister
+ require_once LIBPATH.'/HTML/FormPersister.php';
+ ob_start(array(new HTML_FormPersister(), 'process'));
$this->row = array();
Hlp::addCSS('built-in/scaffold.css');
if ($this->useJs)
@@ -278,11 +281,7 @@ abstract class ScaffoldController extends Controller
$page*$this->pageSize, $this->pageSize);
if (count($filter['form']))
- {
- require_once LIBPATH.'/HTML/FormPersister.php';
- ob_start(array(new HTML_FormPersister(), 'process'));
QFW::$view->assign('filter', $filter['form']);
- }
//получаем пагинатор
$pages = ceil($count/$this->pageSize);
$pager=QFW::$router->blockRoute('helper.nav.pager', Url::A('$'), $pages, $page+1);
@@ -300,10 +299,6 @@ abstract class ScaffoldController extends Controller
*/
public function newBlock()
{
- //инициализация FormPersister
- /*require_once LIBPATH.'/HTML/FormPersister.php';
- ob_start(array(new HTML_FormPersister(), 'process'));*/
-
//получение дефолтовых значений для новой записи
$data = array();
$fields = array();
@@ -339,9 +334,6 @@ abstract class ScaffoldController extends Controller
*/
public function editAction($id=-1)
{
- //инициализация FormPersister
- require_once LIBPATH.'/HTML/FormPersister.php';
- ob_start(array(new HTML_FormPersister(), 'process'));
$errors = array();
if ($_SERVER['REQUEST_METHOD'] == 'POST' && count($_POST['data'][$id])>0)
@@ -454,8 +446,6 @@ abstract class ScaffoldController extends Controller
if (empty($this->sess['multi']['ids']))
QFW::$router->redirect(Url::C('index'));
$ids = $this->sess['multi']['ids'];
- require_once LIBPATH.'/HTML/FormPersister.php';
- ob_start(array(new HTML_FormPersister(), 'process'));
$errors = array();
if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['edit']))
{
diff --git a/lib/Modules/Scaffold/scaffold/edit.php b/lib/Modules/Scaffold/scaffold/edit.php
index 44d4219..8fe2e49 100644
--- a/lib/Modules/Scaffold/scaffold/edit.php
+++ b/lib/Modules/Scaffold/scaffold/edit.php
@@ -1,6 +1,6 @@
<?php require dirname(__FILE__).'/info.php' ?>
<?php echo $this->block(Url::C('preForm'), $id); ?>
-<form class="scaffoldEdit"
+<form class="scaffoldEdit" action="<?php echo Url::C('edit/-1') ?>"
method="post" id="form_<?php echo $table ?>" enctype="multipart/form-data">
<?php echo $this->block(Url::C('preEdit'), $id); ?>
<dl>
@@ -8,13 +8,13 @@
<?php echo $this->block(Url::C('preEditField'.ucfirst($k)), $id); ?>
<?php
$i = $fields[$k];
- if ( ($id == -1 && !$i->disp->new) && (!$i->disp->edit))
+ if ( ($id == -1 && !$i->disp->new) || ($id != -1 && !$i->disp->edit))
continue;
//по умолчанию первичный ключ не редактируем, но если принудительно установим показ
if (!$i->primaryKey && !($i->hide === false))
continue;
?>
- <label>
+ <?php if ($i->label) { ?><label><?php } ?>
<dt<?php if (isset($errors[$k])) echo ' class="err"'; ?>>
<?php echo $i->title ?><?php
if ($i->required) {?><span class="required"></span><?php }
@@ -26,7 +26,7 @@
echo $i->editor($id, $v); ?>
<?php if ($i->desc) {?><small><?php echo $i->desc ?></small><?php } ?>
</dd>
- </label>
+ <?php if ($i->label) { ?></label><?php } ?>
<?php } ?>
<?php echo $this->block(Url::C('preSend'), $id); ?>
<dt></dt>
diff --git a/lib/Modules/Scaffold/scaffold/multidel.php b/lib/Modules/Scaffold/scaffold/multidel.php
index 23df76f..f6014cb 100644
--- a/lib/Modules/Scaffold/scaffold/multidel.php
+++ b/lib/Modules/Scaffold/scaffold/multidel.php
@@ -7,7 +7,7 @@
<tr>
<?php foreach(current($data) as $key=>$v) {
$i = $fields[$key];
- if ($i->hide)
+ if (!$i->disp->multidel)
continue;
$cols++;
?>
@@ -20,7 +20,7 @@
<tr>
<?php foreach($row as $key=>$v) {
$i = $fields[$key];
- if ($i->hide)
+ if (!$i->disp->multidel)
continue;
?>
<td<?php if ($i->class) {?> class="<?php echo $i->class===true ? 'col_'.$key : $i->class ?>"<?php } ?>><?php //отображение обычного не связанного поля
diff --git a/lib/Modules/Scaffold/scaffold/multiedit.php b/lib/Modules/Scaffold/scaffold/multiedit.php
index 1a58082..5d1079f 100644
--- a/lib/Modules/Scaffold/scaffold/multiedit.php
+++ b/lib/Modules/Scaffold/scaffold/multiedit.php
@@ -7,7 +7,7 @@
<tr>
<?php foreach(current($data) as $key=>$v) {
$i = $fields[$key];
- if ($i->hide)
+ if (!$i->disp->multiedit)
continue;
if (!$i->primaryKey && !($i->hide === false))
continue;
@@ -23,7 +23,7 @@
<tr>
<?php foreach($row as $key=>$v) {
$i = $fields[$key];
- if ($i->hide)
+ if (!$i->disp->multiedit)
continue;
if (!$i->primaryKey && !($i->hide === false))
continue;
commit b7728f97fdffbc4a9026861cbac47a73a629eaab
Author: Ivan Borzenkov <iva...@li...>
Date: Fri Jan 21 13:10:39 2011 +0300
Исправлена ошибка в условии показа поля
diff --git a/lib/Modules/Scaffold/scaffold/edit.php b/lib/Modules/Scaffold/scaffold/edit.php
index 163183f..44d4219 100644
--- a/lib/Modules/Scaffold/scaffold/edit.php
+++ b/lib/Modules/Scaffold/scaffold/edit.php
@@ -8,9 +8,7 @@
<?php echo $this->block(Url::C('preEditField'.ucfirst($k)), $id); ?>
<?php
$i = $fields[$k];
- if ($id == -1 && !$i->disp->new)
- continue;
- if (!$i->disp->edit)
+ if ( ($id == -1 && !$i->disp->new) && (!$i->disp->edit))
continue;
//по умолчанию первичный ключ не редактируем, но если принудительно установим показ
if (!$i->primaryKey && !($i->hide === false))
-----------------------------------------------------------------------
Summary of changes:
lib/Modules/Scaffold/ScaffoldController.php | 24 +++++-------------------
lib/Modules/Scaffold/scaffold/edit.php | 10 ++++------
lib/Modules/Scaffold/scaffold/multidel.php | 4 ++--
lib/Modules/Scaffold/scaffold/multiedit.php | 4 ++--
4 files changed, 13 insertions(+), 29 deletions(-)
hooks/post-receive
--
quickfw
|
