((.|\s)*?)}m, '[...]') - reference_content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> " - reference_content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" - # reference_message = JournalForMessage.find(params[:reference_id]) - message = params[:project_respond] + "\n" + reference_content + @jfm = Project.add_new_jour(nil, nil, project_id, options) + @save_succ = @jfm.errors.empty? - - user.add_jour(User.current, message, user.id) - flash[:notice]=l(:label_projects_feedback_respond_success) - # if a_message.size > 5 - # @message = a_message[-5, 5] - # else - # @message = a_message - # end - # @message_count = a_message.count - end + # flash[:notice]=l(:label_projects_feedback_respond_success) respond_to do |format| - format.html { redirect_to :back } + # format.html { redirect_to :back } + format.js #format.api { render_api_ok } end - # redirect_to project_feedback_path(@project) end def new diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index ce4523b2f..1e23197e7 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -39,11 +39,10 @@ class WordsController < ApplicationController #format.api { render_api_ok } end end + def create_reply # deny api. api useless - user_id = request.headers["Referer"].match((%r|/([0-9]{1,})/|))[1] - @user = User.find(user_id) parent_id = params[:reference_id] author_id = User.current.id reply_user_id = params[:reference_user_id] @@ -55,7 +54,7 @@ class WordsController < ApplicationController :reply_id => reply_user_id, :notes => content, :is_readed => false} - @jfm = @user.add_jour(nil, nil, nil, options) + @jfm = add_reply_adapter options respond_to do |format| # format.html { @@ -74,21 +73,8 @@ class WordsController < ApplicationController def destroy @journal_destroyed = JournalsForMessage.delete_message(params[:object_id]) - @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse - @limit = 10 - @feedback_count = @jours.count - @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] - @offset ||= @feedback_pages.offset - @jour = @jours[@offset, @limit] - # if a_message.size > 5 - # @message = a_message[-5, 5] - # else - # @message = a_message - # end - # @message_count = a_message.count respond_to do |format| - format.html { redirect_to :back } format.js #format.api { render_api_ok } end @@ -187,5 +173,32 @@ class WordsController < ApplicationController render_404 end + def obj_distinguish_url_origin + referer = request.headers["Referer"] + obj_id = referer.match(%r(/([0-9]{1,})(/|$)))[1] + if referer.match(/project/) + obj = Project.find_by_id(obj_id) + elsif referer.match(/user/) + obj = User.find_by_id(obj_id) + elsif ( referer.match(/bids/) || referer.match(/calls/) ) + obj = Bid.find_by_id(obj_id) + else + raise 'create reply obj unknow type.' + end + obj + end + + def add_reply_adapter options + obj = obj_distinguish_url_origin + if obj.kind_of? User + obj.add_jour(nil, nil, nil, options) + elsif obj.kind_of? Project + Project.add_new_jour(nil, nil, obj.id, options) + elsif obj.kind_of? Bid + obj.add_jour(nil, nil, nil, options) + else + raise 'create reply obj unknow type.' + end + end #######end of message end \ No newline at end of file diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index e67726d34..329f84742 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -82,7 +82,7 @@ module WelcomeHelper ': '.html_safe << link_to(truncate(strip_tags(event.event_description).gsub(/ /,''), length: 30, omission:'...'), event.event_url, :target => "_blank" ) when 'attachment' - str << content_tag('span', '上传了') << content_tag('span', find_all_event_type(event)) << ': '.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) << link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container)) + str << content_tag('span', '上传了') << content_tag('span', find_all_event_type(event)) << ': '.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) << link_to((' ['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container), :class => "attachments_list_color") else str << content_tag("span", "更新了") << content_tag("span", find_all_event_type(event)) << ': '.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url, :target => "_blank" ) end @@ -110,16 +110,17 @@ module WelcomeHelper # activity.scope=['memos'] # activity.events_welcome(nil, nil, {:limit => limit}) - # resultSet = Memo.where('memos.parent_id IS NULL').includes(:last_reply).order('COALESCE (last_replies_memos.created_at, memos.created_at) DESC').limit(limit) + resultSet = Memo.where('memos.parent_id IS NULL').includes(:last_reply).order('COALESCE (last_replies_memos.created_at, memos.created_at) DESC').limit(limit) # resultSet += Message.where('messages.parent_id IS NULL').includes(:last_reply).order('COALESCE (last_replies_messages.created_on, messages.created_on) DESC').limit(limit) - resultSet = Memo.includes(:children).where('parent_id IS NULL').order('updated_at DESC').limit(limit) - resultSet += Message.includes(:children).where('parent_id IS NULL').order('updated_on DESC').limit(limit) - resultSet.sort! {|x,y| y.event_datetime <=> x.event_datetime} - resultSet = resultSet.to_a - for i in 0..(resultSet.size-1) - resultSet[i] = resultSet[i].children.last if resultSet[i].children.count > 0 - end - resultSet.take(limit) + + # resultSet = Memo.includes(:children).where('parent_id IS NULL').order('updated_at DESC').limit(limit) + # resultSet += Message.includes(:children).where('parent_id IS NULL').order('updated_on DESC').limit(limit) + # resultSet.sort! {|x,y| y.event_datetime <=> x.event_datetime} + # resultSet = resultSet.to_a + # for i in 0..(resultSet.size-1) + # resultSet[i] = resultSet[i].children.last if resultSet[i].children.count > 0 + # end + # resultSet.take(limit) end private @@ -149,7 +150,7 @@ module WelcomeHelper # } # user_objs = User.find_by_sql("SELECT * FROM users WHERE (users.id IN #{"(" << users.join(',') << ")"} )") activity = Redmine::Activity::Fetcher.new(nil) - activity.scope_select{|t| ['changesets', 'documents'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' } + activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' } activity.events_welcome(nil, nil, {:limit => limit, :types => 'welcome'}) end diff --git a/app/models/bid.rb b/app/models/bid.rb index e1b6b799a..d5177116e 100644 --- a/app/models/bid.rb +++ b/app/models/bid.rb @@ -77,8 +77,14 @@ class Bid < ActiveRecord::Base # safe_attributes 'name', # 'description', # 'deadline' - def add_jour(user, notes, reference_user_id = 0) - self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id) + def add_jour(user, notes, reference_user_id = 0, options = {}) + if options.count == 0 + self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id) + else + jfm = self.journals_for_messages.build(options) + jfm.save + jfm + end end def self.creat_bids(budget, deadline, name, description=nil, reward_type) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index e83018be6..550197889 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -27,6 +27,16 @@ class JournalsForMessage < ActiveRecord::Base after_destroy :reset_counters! # default_scope { where('m_parent_id IS NULL') } + + def remove_by_user? user + if( self.user == user || + ( self.jour.kind_of?(User) && self.jour== user ) + ) + true + else + false + end + end def self.delete_message(message_id) self.find(message_id).destroy diff --git a/app/models/project.rb b/app/models/project.rb index d198d38c0..e106ac0c0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -166,10 +166,13 @@ class Project < ActiveRecord::Base pjfm end - def self.add_new_jour(user, notes, id) + def self.add_new_jour(user, notes, id, options={}) project = Project.find(id) - # project.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => 0) - pjfm = project.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0) + if options.count == 0 + pjfm = project.journals_for_messages.build(:user_id => user.id, :notes => notes, :reply_id => 0) + else + pjfm = project.journals_for_messages.build(options) + end pjfm.save pjfm end diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index 2f627fa1d..b5b2f9499 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -1,69 +1,56 @@ - - - -
| - - <% if @bid.reward_type ==3 %> - | <%=l(:label_student_response)%> | - <% else %> -<%=l(:label_user_response)%> | - <% end %> - - -
<%=tip1%>
| <%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> | -
|
- ||||||||
| <%= l(:label_contest_innovate) %> | +<%= l(:label_contest_innovate) %> | <%= l(:label_user_location) %> : |
<% if User.current.logged? %>
@@ -54,4 +54,4 @@
<%= render :partial => "layouts/no_content"%>
<% end %>
-
+<% html_title l(:label_contest_list)%>
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb
index ac724b1a1..d8e80992c 100644
--- a/app/views/bids/index.html.erb
+++ b/app/views/bids/index.html.erb
@@ -36,3 +36,5 @@
<%= render :partial => "layouts/no_content"%>
<% end %>
+
+<% html_title l(:label_requirement_enterprise_list)%>
\ No newline at end of file
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index 22cc1dcd4..78ef3a566 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -1,49 +1,34 @@
-
-
+ <%= @bid.description %> + + <% if @bid.attachments.any?%> + <% options = {:author => true} %> + <%= render :partial => 'attachments/links', + :locals => {:attachments => @bid.attachments, :options => options} %> + <% end %> + + <%= render :partial => "/praise_tread/praise_tread", + :locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%> + + + + -
<%= render :partial => 'history', :locals => { :bid => @bid, :journals => @jour, :state => false} %>
@@ -54,4 +39,3 @@
|