From fb6e22e1457ce4d1503c739d7354d51fe3af4e94 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 6 Dec 2008 21:14:36 +0000
Subject: Implemented photo::_get_photo_add().  You need to create the
 var/uploads directory and make it writable by the server.  The location of
 the temporary upload directory is specified in config/upload.php

---
 core/controllers/photos.php  |  9 +++++++++
 core/controllers/welcome.php | 14 +++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'core/controllers')

diff --git a/core/controllers/photos.php b/core/controllers/photos.php
index 143c3bb8..7a599f4b 100644
--- a/core/controllers/photos.php
+++ b/core/controllers/photos.php
@@ -35,4 +35,13 @@ class Photos_Controller extends Items_Controller {
 
     print $template;
   }
+
+  /**
+   *  @see Rest_Controller::_form_add($parameters)
+   */
+  public function _form_add($parent_id) {
+    $parent = ORM::factory("item", $parent_id);
+
+    print photo::get_add_form($parent)->render();
+  }
 }
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 7f1070ba..e61ae674 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -507,16 +507,8 @@ class Welcome_Controller extends Template_Controller {
     $this->auto_render = false;
   }
 
-  public function _get_add_photo_html() {
-    return '
-      <fieldset>
-        <legend>Photos</legend>
-        <form method="post" action="' . url::site("albums/1")  . '" enctype="multipart/form-data">
-          <input type="submit" value="upload"/>
-          <input id="photo_upload" name="file[]" type="file"/>
-          <input type="hidden" name="type" value="photo"/>
-        </form>
-      </fieldset>
-    ';
+  public function _get_add_photo_html($parent_id=1) {
+    $parent = ORM::factory("item", $parent_id);
+    return photo::get_add_form($parent);
   }
 }
-- 
cgit v1.2.3