small bugfix with a wrong redirect

steveklabnik · steveklabnik · commit a507f6452367 · 2009-12-19T07:31:15.000-05:00
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -21,7 +21,7 @@ def create
 
 		if @message.save
 			flash[:notice] = 'Message was successfully created.'
-			redirect_to user_path(@message.recipient)
+			redirect_to user_path(@message.recipient.username)
 		else
 			render :action => "new"
 		end
diff --git a/generate b/generate
@@ -16582,4 +16582,65 @@ Close this window:  Use ":q<Enter>".[7;37H[K[8;3H Get out of Vim:  Use ":qa!<
     <h1><%= @user.username.humanize %></h1>
     <p><%= link_to @user.link, @user.link %></p>
     <p><%= @user.about %></p>
-    <% unless @user == current_user %>[8;6H <% if current_user.watches.include? @user %>[9;8H <%= link_to "Stop watching #{@user.username}", watching_path(current_user.watchings.detect(@user).first), :mm[10;1Heth
+    <% unless @user == current_user %>[8;6H <% if current_user.watches.include? @user %>[9;8H <%= link_to "Stop watching #{@user.username}", watching_path(current_user.watchings.detect(@user).first), :mm[10;1Hethod => :delete %>[11;6H <% else %>[12;8H <%= link_to "Watch #{@user.username}", watchings_path(:watches_id => @user), :method => :post %>[13;6H <% end %>
+    <% else %>[15;6H <br />
+    <% end %>
+  </div>
+</div>
+<br />
+<br />
+<hr style="width:550px;" />
+<div>
+<p><%= @user.username.humanize %>'s programs:</p><br />
+<ul>
+  <% @user.programs.each do |program| %>
+  <li><%= link_to program.name, program %> - <%= program.description %></li>
+  <% end %>
+</ul>
+<% if @user == current_user %>
+  <br style="clear:both" />
+  <%= link_to "Make a new program", new_program_path %>
+<% end %>
+</div>
+<br style="clear:both" />
+<hr style="width:550px;" />
+<div>
+<p><%= @user.username.humanize %> is watching:</p><br />
+<% @user.watches.each_with_index do |watch, i| %>
+  <%= "<div>" if i % 6 == 0 %><%= link_to image_tag(watch.avatar_url, :style => "margin-right:1em;margin-bottom:1em;;[40;1H"), user_path(watch.username) %> <%= "</div>" if i % 6 == 5 %>
+<% end %>
+</div>
+<%= "</div>" if @user.watches.count % 6 != 0 %>
+[1m[34m~                                                                                                                   [45;1H~                                                                                                                   [46;1H~                                                                                                                   [47;1H~                                                                                                                   [48;1H~                                                                                                                   [49;1H~                                                                                                                   [50;1H~                                                                                                                   [51;1H~                                                                                                                   [52;1H~                                                                                                                   [53;1H~                                                                                                                   [54;1H~                                                                                                                   [55;1H~                                                                                                                   [0m[56;99H29,3[10CAll[30;3H[34h[?25h[?25l[56;99H[K[56;1H:[34h[?25hw[?25l[34h[?25hq[?25l[34h[?25h[?25l"app/views/users/show.html.erb" 41L, 1530C written
+[?1l>[34h[?25h[?1049l]0;steve@deadreckoning:~/src/hackety-hack.com[steve@deadreckoning hackety-hack.com]$ git add .
+]0;steve@deadreckoning:~/src/hackety-hack.com[steve@deadreckoning hackety-hack.com]$ git commit -m "added delete programs"
+[master 5e149b9] added delete programs
+ 6 files changed, 258 insertions(+), 31 deletions(-)
+ rewrite app/views/programs/edit.html.erb (75%)
+]0;steve@deadreckoning:~/src/hackety-hack.com[steve@deadreckoning hackety-hack.com]$ vim app/views/use[K[K[Kme[K[K[K[K[K[K[K[Kcontrollers/messages_controller.rb 
+[?1049h[?1h=[1;56r[34l[34h[?25h[23m[24m[0m[H[J[?25l[56;1H"app/controllers/messages_controller.rb" 47L, 930C[1;1Hclass MessagesController < ApplicationController
+  def index
+    @messages = Message.find(:all, :conditions => ["recipient_id == ?", current_user.id])
+  end
+
+  def show
+    @message = Message.find(params[:id])
+  end
+
+  def new
+    @message = Message.new
+  end
+
+  def edit
+    @message = Message.find(params[:id])
+  end
+
+  def create
+    @message = Message.new(params[:message])
+    @message.sender = current_user[22;4H if @message.save[23;6H flash[:notice] = 'Message was successfully created.'[24;6H redirect_to user_path(@message.recipient)
+    else[26;6H render :action => "new"
+    end
+  end
+
+  def update
+    @message = Message.find(params[:id])[33;4H if @messa
