diff --git a/app/controllers/at_controller.rb b/app/controllers/at_controller.rb index 9994e5a3c..9d7b1fb59 100644 --- a/app/controllers/at_controller.rb +++ b/app/controllers/at_controller.rb @@ -47,6 +47,8 @@ class AtController < ApplicationController find_topic(id) when 'JournalsForMessage' find_journals_for_message(id) + when 'Journal' + find_journal(id) when 'Principal' find_principal(id) when 'BlogComment' @@ -159,6 +161,12 @@ class AtController < ApplicationController #Journal def find_journal(id) + journal = Journal.find id + if journal.journalized_type == 'Issue' + issue_id = journal.issue.id + find_at_users(journal.journalized_type, issue_id) + end + end #Document diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index b5e698954..97b90e7a1 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -192,13 +192,15 @@ class MessagesController < ApplicationController # @reply.reply_id = params[:id] parent.children << @reply else - @quote = params[:quote][:quote] + #@quote = params[:quote][:quote] @reply = Message.new @reply.author = User.current @reply.board = @board + @reply.subject = @topic.subject + @reply.content = params[:content] @reply.safe_attributes = params[:reply] - @reply.content = @quote + @reply.content - @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject] + #@reply.content = @quote + @reply.content + #@reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject] @reply.root_id = @topic.id @topic.children << @reply # @reply.reply_id = params[:id] diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index 7316d82e8..a4b47a646 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -32,7 +32,7 @@ <%= content_for(:header_tags) do %> - <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> + <%= import_ke(enable_at: true, prettify: false, init_activity: true) %> <% end %> @@ -165,11 +165,21 @@
- <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %> - <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %> - <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %> - <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'project_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %> - <% end %> +
+ <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %> + <%#= render :partial => 'form_project', :locals => {:f => f, :replying => true} %> + <%#= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %> + <%#= link_to l(:button_submit), "javascript:void(0)", :onclick => 'project_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %> + +
+
+ +
+ + +
+ <% end %> +