diff --git a/app/helpers/words_helper.rb b/app/helpers/words_helper.rb index 167c78e2c..2e37c7f69 100644 --- a/app/helpers/words_helper.rb +++ b/app/helpers/words_helper.rb @@ -43,5 +43,9 @@ module WordsHelper # content.present? ? content_tag('ul', content, :class => 'watchers') : content content end + + def find_reply_message + JournalsForMessage.where("jour_id = 4").take(2) + end end \ No newline at end of file diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb index 9a4e77591..f65c973a0 100644 --- a/app/views/words/_journal_reply.html.erb +++ b/app/views/words/_journal_reply.html.erb @@ -1,9 +1,32 @@ - -<%= form_tag({:controller => 'words', -:action => 'create_reply'}) do %> -<%= text_area_tag 'project_respond', "", :class => 'noline', :style => "resize: none;", :rows => 4, :placeholder => l(:label_projects_feedback_respond_content) %> - -<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> -<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn", :style => "margin-top: 1px;"%> - -<% end %> \ No newline at end of file + + diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 40fc71e8c..857d76f65 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -1,48 +1,54 @@ + <% if jour.size >0 %> <% remove_allowed = (User.current.id == jour.first.user_id) %> - + <% end %>