added delete programs

steveklabnik · steveklabnik · commit 5e149b9056d1 · 2009-12-19T07:29:37.000-05:00
diff --git a/app/controllers/programs_controller.rb b/app/controllers/programs_controller.rb
@@ -41,5 +41,6 @@ def update
   def destroy
     @program = Program.find(params[:id])
     @program.destroy
+		redirect_to user_path(current_user.username)
   end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -11,7 +11,7 @@ def create
 			steve.watchings.build(:watches_id => @user.id).save
 			@user.watchings.build(:watches_id => 1).save
 			flash[:notice] = "Registration successful."  
-			redirect_to user_path(@user)
+			redirect_to user_path(@user.username)
 		else  
 			render :action => 'new'  
 	 	end  
diff --git a/app/views/programs/edit.html.erb b/app/views/programs/edit.html.erb
@@ -1,28 +1,26 @@
 <h1>Editing program</h1>
 
+<table>
 <% form_for(@program) do |f| %>
   <%= f.error_messages %>
 
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :description %><br />
-    <%= f.text_field :description %>
-  </p>
-  <p>
-    <%= f.label :text %><br />
-    <%= f.text_area :text %>
-  </p>
-  <p>
-    <%= f.label :user_id %><br />
-    <%= f.text_field :user_id %>
-  </p>
-  <p>
-    <%= f.submit 'Update' %>
-  </p>
+  <tr>
+    <td><%= f.label :name %><br /></td>
+    <td><%= f.text_field :name %></td>
+  </tr>
+  <tr>
+    <td><%= f.label :description %><br /></td>
+    <td><%= f.text_field :description %></td>
+  </tr>
+  <tr>
+    <td><%= f.label :text %><br /></td>
+    <td><%= f.text_area :text %></td>
+  </tr>
+  <tr>
+    <td></td><td><%= f.submit 'Update' %></td>
+  </tr>
 <% end %>
+</table>
 
 <%= link_to 'Show', @program %> |
-<%= link_to 'Back', programs_path %>
+<%= link_to 'Back', programs_path %>
diff --git a/app/views/programs/show.html.erb b/app/views/programs/show.html.erb
@@ -10,7 +10,8 @@
 </div>
 
 <% if @program.user == current_user %>
-<%= link_to 'Edit this program', edit_program_path(@program) %>
+<%= link_to 'Edit', edit_program_path(@program) %> |
+<%= link_to 'Delete', program_path(@program), :method => :delete %>
 <% end %>
 
 <h2>Comments</h2><br />
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -26,6 +26,7 @@
   <% end %>
 </ul>
 <% if @user == current_user %>
+  <br style="clear:both" />
   <%= link_to "Make a new program", new_program_path %>
 <% end %>
 </div>
diff --git a/generate b/generate
