diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 550197889..9ca8236d0 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -28,7 +28,15 @@ class JournalsForMessage < ActiveRecord::Base # default_scope { where('m_parent_id IS NULL') } - def remove_by_user? user + def self.create_by_user? user + if user.anonymous? + return false + else + return true + end + end + + def self.remove_by_user? user if( self.user == user || ( self.jour.kind_of?(User) && self.jour== user ) ) diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index a3560fc00..e8fced1fd 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -1,3 +1,4 @@ +<% reply_allow = JournalsForMessage.create_by_user? User.current %> <% tip1 = (@bid.reward_type == 3) ? l(:label_student_response) : l(:label_user_response) %>
<%=tip1%>
@@ -29,11 +30,13 @@ <%= l(:label_bids_published) %> <%= time_tag(journal.created_on).html_safe %> <%= l(:label_bids_published_ago) %> <% ids = 'project_respond_form_'+ journal.id.to_s%> + <% if reply_allow %> <%= link_to(l(:button_quote), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%> <%= link_to l(:label_bid_respond_quote),'', {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.show_name}: '); $('##{ids} textarea') ;return false;"} %> + <% end %> <% if @user==User.current|| User.current.admin? %> <%#= link_to(l(:label_bid_respond_delete), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid},:confirm => l(:label_delete_confirm), :remote => true, :method => 'delete', :class => "delete", :confirm => l(:text_are_you_sure), :title => l(:button_delete)) %> @@ -43,9 +46,11 @@ <% ids = 'project_respond_form_'+ journal.id.to_s%> + <% if reply_allow %><%= format_time reply.created_on %>