friendlier conversation urls/redirects

Change-Id: I85ea47245d72149f984717c169ed855813da8532
Reviewed-on: https://gerrit.instructure.com/5339
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>

Author: jenseng

app/controllers/conversations_controller.rb

@@ -99,6 +99,8 @@ def create
   end
 
   def show
+    return redirect_to "/conversations/#/conversations/#{@conversation.conversation_id}" unless request.xhr?
+    
     @conversation.mark_as_read! if @conversation.unread?
     submissions = []
     if @conversation.one_on_one?
@@ -284,6 +286,7 @@ def matching_participants(options)
 
   def get_conversation(allow_deleted = false)
     @conversation = (allow_deleted ? @current_user.all_conversations : @current_user.conversations).find_by_conversation_id(params[:id] || params[:conversation_id] || 0)
+    raise ActiveRecord::RecordNotFound unless @conversation
   end
 
   def create_message_on_conversation(conversation=@conversation, update_for_sender=true)

app/messages/added_to_conversation.email.erb

@@ -1,5 +1,5 @@
 <% define_content :link do %>
-  http://<%= HostUrl.context_host(asset.context) %>/conversations/#/conversations/<%= asset.conversation_id %>
+  http://<%= HostUrl.context_host(asset.context) %>/conversations/<%= asset.conversation_id %>
 <% end %>
 <% define_content :user_name do %>
   <%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>

app/messages/added_to_conversation.facebook.erb

@@ -1,5 +1,5 @@
 <% define_content :link do %>
-  http://<%= HostUrl.context_host(asset.context) %>/conversations/#/conversations/<%= asset.conversation_id %>
+  http://<%= HostUrl.context_host(asset.context) %>/conversations/<%= asset.conversation_id %>
 <% end %>
 <%= t :body, "%{user_name} just added you to a conversation in Canvas.", :user_name => (asset.author.short_name rescue t(:unknown_user, "Unknown User")) %><br/>
 <b><a href="<%= content :link %>"><%= t :link_text, "View Conversation" %></a></b>

app/messages/added_to_conversation.summary.erb

@@ -1,5 +1,5 @@
 <% define_content :link do %>
-  http://<%= HostUrl.context_host(asset.context) %>/conversations/#/conversations/<%= asset.conversation_id %>
+  http://<%= HostUrl.context_host(asset.context) %>/conversations/<%= asset.conversation_id %>
 <% end %>
 <% define_content :user_name do %>
   <%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>

app/messages/conversation_message.email.erb

@@ -1,5 +1,5 @@
 <% define_content :link do %>
-  http://<%= HostUrl.context_host(asset.context) %>/conversations/#/conversations/<%= asset.conversation_id %>
+  http://<%= HostUrl.context_host(asset.context) %>/conversations/<%= asset.conversation_id %>
 <% end %>
 <% define_content :user_name do %>
   <%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>

app/messages/conversation_message.facebook.erb

@@ -1,5 +1,5 @@
 <% define_content :link do %>
-  http://<%= HostUrl.context_host(asset.context) %>/conversations/#/conversations/<%= asset.conversation_id %>
+  http://<%= HostUrl.context_host(asset.context) %>/conversations/<%= asset.conversation_id %>
 <% end %>
 <%= t :body, "%{user_name} just sent you a message in Canvas.", :user_name => (asset.author.short_name rescue t(:unknown_user, "Unknown User")) %><br/>
 <b><a href="<%= content :link %>"><%= t :link_text, "View Message" %></a></b>

app/messages/conversation_message.summary.erb

@@ -1,5 +1,5 @@
 <% define_content :link do %>
-  http://<%= HostUrl.context_host(asset.context) %>/conversations/#/conversations/<%= asset.conversation_id %>
+  http://<%= HostUrl.context_host(asset.context) %>/conversations/<%= asset.conversation_id %>
 <% end %>
 <% define_content :user_name do %>
   <%= asset.author.short_name rescue t(:unknown_user, "Unknown User") %>

app/views/context/_dashboard_conversation.html.erb

@@ -1,5 +1,5 @@
 <% conversation = dashboard_conversation %>
-<% conversation_path = "#{conversations_path}#/conversations/#{conversation ? conversation.id : '{{ id }}'}" %>
+<% conversation_path = conversation_path(conversation ? conversation.id : '{{ id }}') %>
 <div class="communication_message conversation message_no_context" style="<%= hidden unless conversation %>" id="conversation_<%= conversation ? conversation.id : "blank" %>">
   <%= render :partial => 'context/dashboard_ignore_link', :object => stream_item %>
   <% if conversation %><a name="conversation_<%= conversation.id %>"></a><% end %>

app/views/context/_dashboard_conversation_message.html.erb

@@ -1,7 +1,7 @@
 <% message = dashboard_conversation_message || nil %>
 <% hide_message ||= false %>
 <% author = message ? message.author : @current_user %>
-<% conversation_path = "#{conversations_path}#/conversations/#{conversation ? conversation.id : '{{ id }}'}" %>
+<% conversation_path = conversation_path(conversation ? conversation.id : '{{ id }}') %>
 <div id="dashboard_conversation_message_<%= message ? message.id : "blank" %>" style="<%= hidden unless message %>" class="communication_sub_message <%= 'toggled_communication_sub_message' if hide_message %> <%= 'blank' unless message %>">
   <div class="header">
     <div class="header_title">

spec/controllers/conversations_controller_spec.rb

@@ -62,11 +62,19 @@ def conversation(num_other_users = 1)
   end
 
   describe "GET 'show'" do
-    it "should assign variables" do
+    it "should redirect if not xhr" do
       course_with_student_logged_in(:active_all => true)
       conversation
 
       get 'show', :id => @conversation.conversation_id
+      response.should be_redirect
+    end
+
+    it "should assign variables" do
+      course_with_student_logged_in(:active_all => true)
+      conversation
+
+      xhr :get, 'show', :id => @conversation.conversation_id
       response.should be_success
       assigns[:conversation].should == @conversation
     end