From c3cbf87b3dd30805d8e42f8d19999de9f98edf2c Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 27 Dec 2013 16:30:45 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=A4=A7=E6=A6=82=E6=90=9E=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/welcome_helper.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index fc19ccaa0..c39f1f543 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -109,13 +109,13 @@ module WelcomeHelper # 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.where('parent_id IS NULL').order('updated_at DESC').limit(limit) - resultSet += Message.where('parent_id IS NULL').order('updated_on DESC').limit(limit) - # resultSet = resultSet.to_a + 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} - # for i in 0..(resultSet.size-1) - # resultSet[i] = resultSet[i].parent if resultSet[i].parent - # end + 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 From 398e35cf19e8b19262353afb64bdc5e3279f46c2 Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Sat, 28 Dec 2013 10:48:10 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_new_respond.html.erb | 39 +++++++++++++++++- app/views/welcome/index.html.erb | 20 ++++++---- app/views/words/_journal_reply_items.html.erb | 8 ++-- app/views/words/_message.html.erb | 3 +- app/views/words/_new_respond.html.erb | 40 ++++++++++++++++++- .../stylesheets/application.css | 14 ++++++- 6 files changed, 107 insertions(+), 17 deletions(-) diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb index e6b072399..25e448ff4 100644 --- a/app/views/projects/_new_respond.html.erb +++ b/app/views/projects/_new_respond.html.erb @@ -1,5 +1,42 @@ + <%= form_tag({:controller => 'projects', :action => 'project_respond'}) do %> -<%= text_area_tag 'project_respond', "", :class => 'noline', :required => true, :style => "resize: none;", :rows => 6, :placeholder => l(:label_projects_feedback_respond_content) %> +<%= text_area_tag 'project_respond', "", + :class => 'noline', :required => true, + :style => "resize: none;", :rows => 6, + :placeholder => l(:label_projects_feedback_respond_content), + :maxlength => 250 %> <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 2f0279578..6141a724f 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -74,7 +74,11 @@ $('#' + id).val(''); } } - + + $(function(){ + $("a").attr("target", "_blank"); + }); + function showInfo(id, content) { var text = $('#' + id); if (text.val() == '') { @@ -90,10 +94,10 @@ <%= stylesheet_link_tag 'welcome' %> -
+ -
-
    +
    +

      贴吧动态

      @@ -108,7 +112,7 @@ <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %>
      - <%=time_tag_welcome(topic_last_time topic)%>前 + <%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前 由 <%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);", :target => "_blank" %> 发表 @@ -120,8 +124,8 @@
    -
    -
      +
      +

        用户动态

        <%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank" %>
        @@ -139,7 +143,7 @@
      -
    +

    热门项目

    diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 9408722d9..738ce2132 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -3,10 +3,12 @@ <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %> -
    +
    <% id = 'project_respond_form_'+ reply.id.to_s %> - <%= link_to reply.user.name, user_path(reply.user) %>:  - <%= reply.notes %> +

    + <%= link_to reply.user.name, user_path(reply.user) %>:  + <%= reply.notes %> +

    <%# ids = 'project_respond_form_'+ journal.id.to_s%>

    diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index e9e14034d..781b8eea9 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -31,7 +31,8 @@

    <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal.id} %> -
    +
    +
    <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
    diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb index 25d4b7fcf..adc897e40 100644 --- a/app/views/words/_new_respond.html.erb +++ b/app/views/words/_new_respond.html.erb @@ -1,9 +1,45 @@ + <%= form_tag({:controller => 'words', :action => 'create_reply'}, :remote => true) do %> -<%= text_area_tag 'user_notes', "", :class => 'noline', :style => "resize: none;", :rows => 4, :placeholder => l(:label_projects_feedback_respond_content) %> +<%= text_area_tag 'user_notes', "", :class => 'noline', + :style => "resize: none;", :rows => 4, + :placeholder => l(:label_projects_feedback_respond_content), + :maxlength => 250 %> <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %> <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => journal.user.id %> <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id %> -<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise", :style => "margin-top: 1px;"%> +<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "enterprise", :style => "float: right; margin-top: 1px; margin-right: 4px;"%> <% end %> \ No newline at end of file diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 0dcca361b..f57d10552 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -2125,7 +2125,7 @@ ul.messages-for-user-reply li { display: none; width: 87%; margin: auto; - clear:both; + clear: both; } .outer-message-for-use p { @@ -2134,10 +2134,20 @@ ul.messages-for-user-reply li { margin-top: 5px; } -.body p { +.message-body p { margin: 0; padding: 0; margin-top: 4px; margin-left: 4px; font-size: 9pt; +} + +.message-body { + margin: 0; + padding: 0; + margin-left: 40px; +} + +.counter { + float: left; } \ No newline at end of file From 997c5460839bb1ea4ce510ac16f9a789184d2127 Mon Sep 17 00:00:00 2001 From: yanxd Date: Sat, 28 Dec 2013 10:48:22 +0800 Subject: [PATCH 03/11] remove html char --- app/helpers/welcome_helper.rb | 5 ++++- app/models/journal_observer.rb | 15 +++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index c39f1f543..e67726d34 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -77,7 +77,10 @@ module WelcomeHelper when 'news' , 'issue', 'message' , 'bid' , 'wiki-page' , 'document' 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" ) when 'reply' ,'Reply', 'Memo' - str << content_tag("span", "发表了") << content_tag("span", find_all_event_type(event)) << ': '.html_safe << link_to(truncate(strip_tags(event.event_description), length: 30, omission:'...'), event.event_url, :target => "_blank" ) + str << content_tag("span", "发表了") << + content_tag("span", find_all_event_type(event)) << + ': '.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)) else diff --git a/app/models/journal_observer.rb b/app/models/journal_observer.rb index 32d0f8d01..29a754ff9 100644 --- a/app/models/journal_observer.rb +++ b/app/models/journal_observer.rb @@ -18,15 +18,14 @@ class JournalObserver < ActiveRecord::Observer def after_create(journal) if journal.notify? && - (Setting.notified_events.include?('issue_updated') || - (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) || - (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) || - (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?) + (Setting.notified_events.include?('issue_updated') || + (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) || + (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) || + (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?) ) - ##by senluo - thread4=Thread.new do - Mailer.issue_edit(journal).deliver - end + # Thread.new do + Mailer.issue_edit(journal).deliver + # end end end end From ed55fe01752304946463a13c31644a670d6ea71e Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Sat, 28 Dec 2013 10:57:56 +0800 Subject: [PATCH 04/11] 1 --- app/views/projects/_new_respond.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb index 25e448ff4..f0d43c439 100644 --- a/app/views/projects/_new_respond.html.erb +++ b/app/views/projects/_new_respond.html.erb @@ -23,10 +23,13 @@ function setMaxLength() { function checkMaxLength() { var maxLength = this.getAttribute('maxlength'); var currentLength = this.value.length; - if (currentLength > maxLength) + alert(currentLength); + if (currentLength >= maxLength) { this.relatedElement.className = 'toomuch'; - else + } + else { this.relatedElement.className = ''; + } this.relatedElement.firstChild.nodeValue = currentLength; } From b0bb8b4a484e122ea33a4a31ef39215988de452e Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Sat, 28 Dec 2013 12:09:56 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/words/_journal_reply_items.html.erb | 7 ++----- public/stylesheets/welcome.css | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 738ce2132..2b2bffbeb 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -1,23 +1,20 @@ <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
  • - <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %> + <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
    - <% id = 'project_respond_form_'+ reply.id.to_s %> + <% id = 'project_respond_form_'+ reply.id.to_s %>

    <%= link_to reply.user.name, user_path(reply.user) %>:  <%= reply.notes %>

    - <%# ids = 'project_respond_form_'+ journal.id.to_s%> -

    <%= format_time reply.created_on %>

      <% fetch_user_leaveWord_reply(journal).each do |reply|%> - <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply.id} %> + <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply} %> <% end %>
    diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 9408722d9..f90a259fc 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -13,7 +13,7 @@ <%= format_time reply.created_on %>
    - <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal.id} %> + <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal} %>
    <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %> diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb index 25d4b7fcf..cc0a117fb 100644 --- a/app/views/words/_new_respond.html.erb +++ b/app/views/words/_new_respond.html.erb @@ -2,8 +2,8 @@ <%= text_area_tag 'user_notes', "", :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 %> -<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => journal.user.id %> -<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_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 => "enterprise", :style => "margin-top: 1px;"%> <% end %> \ No newline at end of file diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb index 6d625bdc5..7c8e75990 100644 --- a/app/views/words/create_reply.js.erb +++ b/app/views/words/create_reply.js.erb @@ -1,7 +1,7 @@ <% if @save_succ %> var pre_append = $('<%= j( render :partial => "words/journal_reply_items", - :locals => {:reply => @jfm, :journal => @jfm.parent, :m_reply_id => @jfm.id} + :locals => {:reply => @jfm, :journal => @jfm.parent, :m_reply_id => @jfm} ) %>').hide(); $('#journal_reply_ul_<%=@jfm.m_parent_id%>').append(pre_append); pre_append.fadeIn(600); From 1996283bd435c74f9cef582936206b004a04daa4 Mon Sep 17 00:00:00 2001 From: yanxd Date: Sat, 28 Dec 2013 12:27:35 +0800 Subject: [PATCH 07/11] invoke char length js. --- app/views/words/create_reply.js.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb index 7c8e75990..965c58ed4 100644 --- a/app/views/words/create_reply.js.erb +++ b/app/views/words/create_reply.js.erb @@ -7,6 +7,7 @@ pre_append.fadeIn(600); $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea').val(''); $('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide(); + setMaxLength(); <% else %> alert("<%= l(:label_feedback_fail) %>"); <% end %> \ No newline at end of file From ae094bde2889c9c7ed0f17bc4b3e197024cb4080 Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Sat, 28 Dec 2013 13:14:38 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/index.html.erb | 8 +++----- app/views/words/_new_respond.html.erb | 2 +- public/stylesheets/welcome.css | 6 +++++- public/themes/redpenny-master/stylesheets/application.css | 4 ++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 6141a724f..b230c3534 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -98,12 +98,10 @@
      -
      -

      贴吧动态

      - +
      +

      贴吧动态

      <%= link_to "更多>>", forums_path, :target => "_blank" %>
      -
      <% find_new_forum_topics(8).each do |topic|%>
    • @@ -126,7 +124,7 @@
        -

        用户动态

        +

        用户动态

        <%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank" %>
        <% find_all_activities.each do |event| %> diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb index 43049c604..e803eb305 100644 --- a/app/views/words/_new_respond.html.erb +++ b/app/views/words/_new_respond.html.erb @@ -23,7 +23,7 @@ function setMaxLength() { function checkMaxLength() { var maxLength = this.getAttribute('maxlength'); var currentLength = this.value.length; - if (currentLength > maxLength) + if (currentLength >= maxLength) this.relatedElement.className = 'toomuch'; else this.relatedElement.className = ''; diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index 7eeea1b00..fcbe12d58 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -87,9 +87,13 @@ ul.welcome-message-list{ .welcome-message-list h3, .user-welcome-message-list h3 { border-bottom: 1.5px solid rgb(21, 165, 200); padding: 2px; - margin-left: 10px; + /*margin-left: 10px;*/ font-size: 16px; } + +.user-message-box-list { + margin-left: 6px; +} /*鍚勭鍒楄〃鏄剧ず*/ .d-p-index-box{ /*border: 1px solid #e6e6e6;*/ diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index f57d10552..25d46c7dd 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -2150,4 +2150,8 @@ ul.messages-for-user-reply li { .counter { float: left; +} + +.toomuch { + color: red; } \ No newline at end of file From 69448b36ea7a34515ce8de9d081ecb6b3b94116b Mon Sep 17 00:00:00 2001 From: yanxd Date: Sat, 28 Dec 2013 13:16:22 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=AD=97=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/words/_message.html.erb | 36 +++++++++++++++++++++++++++ app/views/words/_new_respond.html.erb | 32 ------------------------ app/views/words/create_reply.js.erb | 5 ++-- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 91950fade..0f3fe64fe 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -1,4 +1,40 @@ + <% if jour.size >0 %> <% remove_allowed = (User.current.id == jour.first.user_id) %>
          diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb index 43049c604..d3f4145a8 100644 --- a/app/views/words/_new_respond.html.erb +++ b/app/views/words/_new_respond.html.erb @@ -1,36 +1,4 @@ - <%= form_tag({:controller => 'words', :action => 'create_reply'}, :remote => true) do %> <%= text_area_tag 'user_notes', "", :class => 'noline', :style => "resize: none;", :rows => 4, diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb index 965c58ed4..eb2ea7369 100644 --- a/app/views/words/create_reply.js.erb +++ b/app/views/words/create_reply.js.erb @@ -5,9 +5,10 @@ ) %>').hide(); $('#journal_reply_ul_<%=@jfm.m_parent_id%>').append(pre_append); pre_append.fadeIn(600); - $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea').val(''); + var textarea = $('#project_respond_form_<%=@jfm.m_reply_id.to_s%> textarea'); + textarea.val(''); $('#project_respond_form_<%=@jfm.m_reply_id.to_s%>').hide(); - setMaxLength(); + setMaxLengthItem(pre_append.find('textarea')[0]); <% else %> alert("<%= l(:label_feedback_fail) %>"); <% end %> \ No newline at end of file From 8cb3756bbc8c7d2cebbf28c878e1ef2d0c96104b Mon Sep 17 00:00:00 2001 From: yanxd Date: Sat, 28 Dec 2013 13:33:04 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message_observer.rb | 10 +++++----- app/views/welcome/index.html.erb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/journals_for_message_observer.rb b/app/models/journals_for_message_observer.rb index 8a8589c99..e5fdfb187 100644 --- a/app/models/journals_for_message_observer.rb +++ b/app/models/journals_for_message_observer.rb @@ -1,9 +1,9 @@ # Added by young class JournalsForMessageObserver < ActiveRecord::Observer - def after_create(journals_for_message) - thread4=Thread.new do - Mailer.journals_for_message_add(User.current, journals_for_message).deliver - end - end + def after_create(journals_for_message) + Thread.new do + Mailer.journals_for_message_add(User.current, journals_for_message).deliver + end + end end diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index b230c3534..85cd06eef 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -114,7 +114,7 @@ 由 <%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);", :target => "_blank" %> 发表 - 回复(<%= link_to topic.replies_count, topic.event_url, :target => "_blank" %>) + 回复(<%= link_to (topic.parent ? topic.parent.replies_count : topic.replies_count), topic.event_url, :target => "_blank" %>)
        <% end %> From 42fa7eb4c1ddd4403f217582c972b0e4cd0a52a1 Mon Sep 17 00:00:00 2001 From: yanxd Date: Sat, 28 Dec 2013 13:40:22 +0800 Subject: [PATCH 11/11] dd --- app/views/projects/_new_respond.html.erb | 36 ------------------------ 1 file changed, 36 deletions(-) diff --git a/app/views/projects/_new_respond.html.erb b/app/views/projects/_new_respond.html.erb index f0d43c439..da9185d0c 100644 --- a/app/views/projects/_new_respond.html.erb +++ b/app/views/projects/_new_respond.html.erb @@ -1,39 +1,3 @@ - <%= form_tag({:controller => 'projects', :action => 'project_respond'}) do %> <%= text_area_tag 'project_respond', "", :class => 'noline', :required => true,