From: Matthew Horsfall (alh) <wolfsage@gmail.com>
Date: Wed, 5 Oct 2011 17:58:03 +0000 (-0400)
Subject: Minor fixes to make updating actually work.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=alh_admin_ui;p=catagits%2FApp-IdiotBox.git

Minor fixes to make updating actually work.

Note that updating a video doesn't yet work. Needs sql work.
---

diff --git a/lib/App/IdiotBox.pm b/lib/App/IdiotBox.pm
index 4895302..e9aa7fe 100644
--- a/lib/App/IdiotBox.pm
+++ b/lib/App/IdiotBox.pm
@@ -70,7 +70,7 @@ sub dispatch_request {
 
         return $self->show_edit_video_page($video, message => $err) if $err;
 
-        $self->videos->replace($video, $uv);
+        $bucket->videos->replace($video, $uv);
 
         $self->show_edit_video_page($video, message => "Video updated");
       },
@@ -79,11 +79,10 @@ sub dispatch_request {
     },
 
     sub (POST + %edit_bucket=&*) {
-      my ($self, $new_name) = @_;
-	die "WTF";
-      my ($ub, $err) = $bucket->update(
-        name => $new_name,
-      );
+      my ($self, undef, $args) = @_;
+      delete $args->{edit_bucket};
+
+      my ($ub, $err) = $bucket->update(%$args);
 
       return $self->show_admin_page(message => $err) if $err;
 
diff --git a/lib/App/IdiotBox/Video.pm b/lib/App/IdiotBox/Video.pm
index cd12c20..e02fd89 100644
--- a/lib/App/IdiotBox/Video.pm
+++ b/lib/App/IdiotBox/Video.pm
@@ -4,6 +4,10 @@ use Moo;
 
 sub fields { return qw(slug bucket_slug name author details announcement_id) }
 
+with 'App::IdiotBox::Clonable';
+
+sub announcement_id { shift->{announcement_id} }
+sub bucket_slug { shift->{bucket_slug} }
 sub slug { shift->{slug} }
 sub name { shift->{name} }
 sub author { shift->{author} }
diff --git a/share/html/deleted.html b/share/html/deleted.html
index 41acd38..50913fe 100644
--- a/share/html/deleted.html
+++ b/share/html/deleted.html
@@ -2,7 +2,7 @@
 
           <div id="custom-html">        
             <h1>
-              The bucket was deleted. Say good by to <span class="bucket-name">THIS IZ MAI BUKKIT</span>
+              The bucket was deleted. Say good bye to <span class="bucket-name">THIS IZ MAI BUKKIT</span>
             </h1>
           </div>
           
diff --git a/share/html/edit.html b/share/html/edit.html
index 8a11a37..c37b3fe 100644
--- a/share/html/edit.html
+++ b/share/html/edit.html
@@ -8,7 +8,7 @@
             <form enctype="multipart/form-data" class="edit-bucket-form" action="" method="POST">
 -->
             <form class="edit-bucket-form" action="" method="POST">
-              <label for="new_name">Enter a new name for this bucket</label> <input type="text" name="new_name"/>
+              <label for="new_name">Enter a new name for this bucket</label> <input type="text" name="name"/>
               <br /><br />
 <!--
               <label for="new_file">Upload new file to bucket</label> <input type="file" name="new_file" accept="*.flv,*.m4v"/>
diff --git a/share/skin/presentingperl/html/deleted_bucket.html b/share/skin/presentingperl/html/deleted_bucket.html
index 41acd38..50913fe 100644
--- a/share/skin/presentingperl/html/deleted_bucket.html
+++ b/share/skin/presentingperl/html/deleted_bucket.html
@@ -2,7 +2,7 @@
 
           <div id="custom-html">        
             <h1>
-              The bucket was deleted. Say good by to <span class="bucket-name">THIS IZ MAI BUKKIT</span>
+              The bucket was deleted. Say good bye to <span class="bucket-name">THIS IZ MAI BUKKIT</span>
             </h1>
           </div>
           
diff --git a/share/skin/presentingperl/html/edit_bucket.html b/share/skin/presentingperl/html/edit_bucket.html
index 24c5036..7b80ceb 100644
--- a/share/skin/presentingperl/html/edit_bucket.html
+++ b/share/skin/presentingperl/html/edit_bucket.html
@@ -14,7 +14,7 @@
             <form enctype="multipart/form-data" class="edit-bucket-form" action="" method="POST">
 -->
             <form class="edit-bucket-form" action="" method="POST">
-              <label for="new_name">Enter a new name for this bucket</label> <input type="text" name="new_name"/>
+              <label for="new_name">Enter a new name for this bucket</label> <input type="text" name="name"/>
               <br /><br />
 <!--
               <label for="new_file">Upload new file to bucket</label> <input type="file" name="new_file" accept="*.flv,*.m4v"/>
diff --git a/share/skin/presentingperl/html/edit_video.html b/share/skin/presentingperl/html/edit_video.html
index 3b68fdb..040e4df 100644
--- a/share/skin/presentingperl/html/edit_video.html
+++ b/share/skin/presentingperl/html/edit_video.html
@@ -15,9 +15,9 @@
             </p>
 
             <form class="edit-video-form" action="" method="POST">
-              <label for="new_title">Title:</label> <input class="video-name" type="text" name="new_title"/>
+              <label for="new_title">Title:</label> <input class="video-name" type="text" name="name"/>
               <br /><br />
-              <label for="new_author">Author:</label> <input class="author-name" type="text" name="new_author"/>
+              <label for="new_author">Author:</label> <input class="author-name" type="text" name="author"/>
               <br /><br />
               <input type="submit" name="edit_video" value="Modify"/>
             </form>