stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert commit 078c77a62b and change the

Browse Source 
tag_event:item_edit_form to use the new Form_Script library to inject
script into a form.
This commit is contained in:
Tim Almdal
2009-07-28 05:40:28 -07:00
parent 69f9aea5db
commit 2e8f73d4e9
9 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/controllers/albums.php
+2 -3
View File
@@ -166,8 +166,7 @@ class Albums_Controller extends Items_Controller {
access::required("view", $album);
access::required("edit", $album);
$view = album::get_edit_form($album);
$form = $view->form;
$form = album::get_edit_form($album);
if ($valid = $form->validate()) {
// Make sure that there's not a conflict
if ($album->id != 1 &&
@@ -203,7 +202,7 @@ class Albums_Controller extends Items_Controller {
} else {
print json_encode(
array("result" => "error",
"form" => $view->__toString()));
"form" => $form->__toString()));
}
}
modules/gallery/controllers/movies.php
+2 -3
View File
@@ -70,8 +70,7 @@ class Movies_Controller extends Items_Controller {
access::required("view", $photo);
access::required("edit", $photo);
$view = photo::get_edit_form($photo);
$form = $view->form;
$form = photo::get_edit_form($photo);
if ($valid = $form->validate()) {
// Make sure that there's not a conflict
if (Database::instance()
@@ -102,7 +101,7 @@ class Movies_Controller extends Items_Controller {
} else {
print json_encode(
array("result" => "error",
"form" => $view->__toString()));
"form" => $form->__toString()));
}
}
modules/gallery/controllers/photos.php
+2 -3
View File
@@ -61,8 +61,7 @@ class Photos_Controller extends Items_Controller {
access::required("view", $photo);
access::required("edit", $photo);
$view = photo::get_edit_form($photo);
$form = $view->form;
$form = photo::get_edit_form($photo);
if ($valid = $form->validate()) {
if ($form->edit_item->filename->value != $photo->name) {
// Make sure that there's not a conflict
@@ -95,7 +94,7 @@ class Photos_Controller extends Items_Controller {
} else {
print json_encode(
array("result" => "error",
"form" => $view->__toString()));
"form" => $form->__toString()));
}
}