((.|\s)*?)}m, '[...]') - @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " + @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> " @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" @id = user.id rescue ActiveRecord::RecordNotFound diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 24784d26..1908213c 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -67,7 +67,7 @@ class JournalsController < ApplicationController end # Replaces pre blocks with [...] text = text.to_s.strip.gsub(%r{
((.|\s)*?)}m, '[...]') - @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " + @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> " @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" @id = user.id rescue ActiveRecord::RecordNotFound diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index b67deb89..5ae6d3bb 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -112,7 +112,7 @@ class MessagesController < ApplicationController @subject = @message.subject @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:') - @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " + @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " @content << @message.content.to_s.strip.gsub(%r{
((.|\s)*?)}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" end diff --git a/app/controllers/test_controller.rb b/app/controllers/test_controller.rb index a123f3b5..e668a234 100644 --- a/app/controllers/test_controller.rb +++ b/app/controllers/test_controller.rb @@ -9,27 +9,27 @@ def index # @message.each do |m| # Activity.create(:act_id => m.id, :act_type => 'Message', :user_id => m.author_id) # end - activity = Message.all - activity += News.all - activity += Journal.all - activity += Issue.all - activity += Bid.all - @activity = activity.sort {|x,y| x.created_on <=> y.created_on} - @activity.each do |act| - if act.instance_of?(Bid) - act.acts << Activity.new(:user_id => act.author_id) - elsif act.instance_of?(News) - act.acts << Activity.new(:user_id => act.author_id) - elsif act.instance_of?(Message) - act.acts << Activity.new(:user_id => act.author_id) - elsif act.instance_of?(Journal) - act.acts << Activity.new(:user_id => act.user_id) - elsif act.instance_of?(Issue) - act.acts << Activity.new(:user_id => act.author_id) - elsif act.instance_of?(Changeset) - act.acts << Activity.new(:user_id => act.user_id) - end - end + # activity = Message.all + # activity += News.all + # activity += Journal.all + # activity += Issue.all + # activity += Bid.all + # @activity = activity.sort {|x,y| x.created_on <=> y.created_on} + # @activity.each do |act| + # if act.instance_of?(Bid) + # act.acts << Activity.new(:user_id => act.author_id) + # elsif act.instance_of?(News) + # act.acts << Activity.new(:user_id => act.author_id) + # elsif act.instance_of?(Message) + # act.acts << Activity.new(:user_id => act.author_id) + # elsif act.instance_of?(Journal) + # act.acts << Activity.new(:user_id => act.user_id) + # elsif act.instance_of?(Issue) + # act.acts << Activity.new(:user_id => act.author_id) + # elsif act.instance_of?(Changeset) + # act.acts << Activity.new(:user_id => act.user_id) + # end + # end #@watchers_of_projects = WatchersOfProjects.new diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 1f05b0e8..60b7d8bd 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -5,7 +5,11 @@ class WordsController < ApplicationController def create if params[:new_form][:user_message].size>0 unless params[:user_id].nil? - message = params[:new_form][:user_message] + if params[:reference_content] + message = params[:reference_content] + params[:new_form][:user_message] + else + message = params[:new_form][:user_message] + end refer_user_id = params[:new_form][:reference_user_id].to_i @user.add_jour(User.current, message, refer_user_id) @@ -64,7 +68,7 @@ class WordsController < ApplicationController end # Replaces pre blocks with [...] text = text.to_s.strip.gsub(%r{
((.|\s)*?)}m, '[...]') - @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " + @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> " @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" @id = user.id rescue ActiveRecord::RecordNotFound diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index c33013d9..00ad850f 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -1,24 +1,7 @@
| <%=l(:label_user_response)%>(<%= journals.count%>) | -<% if journals.size > 5 %>
-<% unless state%>
-
-<%= link_to l(:button_more),
- {:controller => 'bids', :action => 'more', :id => bid},
- :remote => true,
- :method => 'get' %>
-
-<% else %>
-
-<%= link_to l(:button_back),
- {:controller => 'bids', :action => 'back', :id => bid},
- :remote => true,
- :method => 'get' %>
-
-<% end %>
-<% end %> | + | <%=l(:label_user_response)%> |
| <%= textilizable content %> | +
| <%= hidden_field_tag 'reference_content', params[:reference_content], :value => content%> | +
| <%= textilizable content %> | +
| <%= hidden_field_tag 'reference_content', params[:reference_content], :value => content%> | +