From e02675b730fb814105e1cb9dceb0e25fdcbd3e27 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 19 Jan 2010 19:31:01 -0800
Subject: Change "filename" to "name" in the edit album form.  I'd rather have
 consistency between field names than deal with underlying issues with Forge
 bitching about the "name" property.

---
 modules/gallery/controllers/movies.php | 5 +----
 modules/gallery/controllers/photos.php | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'modules/gallery/controllers')

diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 0908e281..b51282b3 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -66,14 +66,11 @@ class Movies_Controller extends Items_Controller {
       $movie->title = $form->edit_item->title->value;
       $movie->description = $form->edit_item->description->value;
       $movie->slug = $form->edit_item->slug->value;
-      $movie->name = $form->edit_item->filename->value;
+      $movie->name = $form->edit_item->inputs["name"]->value;
       $movie->validate();
     } catch (ORM_Validation_Exception $e) {
       // Translate ORM validation errors into form error messages
       foreach ($e->validation->errors() as $key => $error) {
-        if ($key == "name") {
-          $key = "filename";
-        }
         $form->edit_item->inputs[$key]->add_error($error, 1);
       }
       $valid = false;
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 98f2126d..b5da3884 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -66,14 +66,11 @@ class Photos_Controller extends Items_Controller {
       $photo->title = $form->edit_item->title->value;
       $photo->description = $form->edit_item->description->value;
       $photo->slug = $form->edit_item->slug->value;
-      $photo->name = $form->edit_item->filename->value;
+      $photo->name = $form->edit_item->inputs["name"]->value;
       $photo->validate();
     } catch (ORM_Validation_Exception $e) {
       // Translate ORM validation errors into form error messages
       foreach ($e->validation->errors() as $key => $error) {
-        if ($key == "name") {
-          $key = "filename";
-        }
         $form->edit_item->inputs[$key]->add_error($error, 1);
       }
       $valid = false;
-- 
cgit v1.2.3