diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index eb41db700..97d84d6a6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -299,7 +299,7 @@ class ProjectsController < ApplicationController def project_respond # will_reply = JournalsForMessage.find(params[:reference_id]) if params[:reference_id] project_id = request.headers["Referer"].match((%r|/([0-9]{1,})/|))[1] - @project = Project.find(project_id) + # @project = Project.find_by_id(project_id) parent_id = params[:reference_id] author_id = User.current.id reply_user_id = params[:reference_user_id] @@ -312,13 +312,14 @@ class ProjectsController < ApplicationController :notes => content, :is_readed => false} - @jfm = @project.add_new_jour(nil, nil, nil, options) + @jfm = Project.add_new_jour(nil, nil, project_id, options) # flash[:notice]=l(:label_projects_feedback_respond_success) respond_to do |format| format.html { redirect_to :back } + format.js #format.api { render_api_ok } end end diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb index da9185d0c..a8a3e3a6f 100644 --- a/app/views/projects/_new_respond.html.erb +++ b/app/views/projects/_new_respond.html.erb @@ -6,6 +6,8 @@ :maxlength => 250 %> <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> +<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %> +<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %> <%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%> <%end%> diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index b5588ee0f..e32d75670 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -44,7 +44,7 @@