From ddca1a0316a4eaebdc921ece06d6cdd6118f13ce Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 8 Oct 2014 14:57:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?#1331=20=E5=88=9B=E6=96=B0=E7=AB=9E?= =?UTF-8?q?=E8=B5=9B=EF=BC=9A=E7=82=B9=E5=87=BB=E7=AB=9E=E8=B5=9B=E2=80=9C?= =?UTF-8?q?=202014=20=E5=B9=B4=20Android=20=E7=A8=8B=E5=BA=8F=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E7=AB=9E=E8=B5=9B=20=E2=80=9D=E8=BF=94=E5=9B=9E404?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E5=8E=9F=E5=9B=A0=EF=BC=8C1=E3=80=81?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=BC=BA=E5=A4=B1=EF=BC=8C=E8=A1=A5=E4=B8=8A?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E3=80=822=E3=80=81=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=A4=84=E5=8A=A0=E4=B8=8A=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E3=80=823=E3=80=81=E5=AF=B9=E5=BA=94show=5Fcontest=5Fuser?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=E4=B8=80=E4=B8=AA@users=E5=86=99?= =?UTF-8?q?=E9=94=99=E6=88=90@uers=E4=BF=AE=E6=AD=A3=E4=B9=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/contests_controller.rb | 2 +- app/views/layouts/base_newcontest.html.erb | 6 +++--- config/routes.rb | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 1b7791ac4..71edfe835 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -258,7 +258,7 @@ class ContestsController < ApplicationController contests.each do |contest| contest.projects.each do |project| - @uers += project.users + @users += project.users end end # end diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index c8e78d7f5..adce80d24 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -179,9 +179,9 @@
<%= l(:label_x_followers, :count => @contest.watcher_users.count) %> - + <% if show_more_fans?(@contest) %> + <%= link_to l(:label_more), show_contest_user_contest_path(@contest) %> + <% end %>
diff --git a/config/routes.rb b/config/routes.rb index c4584ea7b..f4f858a9f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -132,6 +132,7 @@ RedmineApp::Application.routes.draw do match 'add_softapplication' , :via => [:get, :post] match 'create' , :via => :post match 'settings' , :via => [:get, :post] + match 'show_contest_user' end end From 30ae933e2725170ad073618c2d8e8944aa10c929 Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 8 Oct 2014 15:36:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?#1326=20=E7=BC=96=E8=BE=91=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E5=8D=B4=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=9A=84=E9=99=84=E4=BB=B6=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 1 + app/views/memos/edit.html.erb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 9f261c78a..b980331df 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -148,6 +148,7 @@ class MemosController < ApplicationController @memo.update_column(:sticky, params[:memo][:sticky]) && @memo.update_column(:lock, params[:memo][:lock])) @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads])) + @memo.save # @memo.root.update_attribute(:updated_at, @memo.updated_at) format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"} else diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index 04d95ae86..2e606a94d 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -26,6 +26,10 @@

<%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %>

+

+ <%= l(:label_attachment_plural) %>
+ <%= render :partial => 'attachments/form', :locals => {:container => @memo} %> +


<%= f.submit :value => l(:button_change) %>  <%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%> From 879ede46f00f181e324f497be5349d673d6b845b Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 8 Oct 2014 16:11:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?#1337=20=E5=85=AC=E5=85=B1=E8=B4=B4?= =?UTF-8?q?=E5=90=A7--=E7=BC=96=E8=BE=91=E5=B8=96=E5=AD=90=EF=BC=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9C=80=E4=B8=8B=E6=96=B9=E2=80=9C=E4=B8=BB?= =?UTF-8?q?=E5=8A=9E=E5=8D=95=E4=BD=8D=E2=80=9D=E7=A7=BB=E4=BD=8D=20footer?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_memos.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb index 14944792d..11f786a70 100644 --- a/app/views/layouts/base_memos.html.erb +++ b/app/views/layouts/base_memos.html.erb @@ -86,8 +86,9 @@ <%= yield %> <%= call_hook :view_layouts_base_content %>
+ <%= render :partial => 'layouts/base_footer'%> - <%= render :partial => 'layouts/base_footer'%> + =E4=BF=AE=E5=A4=8D=E2=80=9C=E4=B8=BB=E5=8A=9E=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E2=80=9D=E4=BD=8D=E7=BD=AE=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_memos.html.erb | 3 +-- app/views/memos/edit.html.erb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb index 11f786a70..14944792d 100644 --- a/app/views/layouts/base_memos.html.erb +++ b/app/views/layouts/base_memos.html.erb @@ -86,9 +86,8 @@ <%= yield %> <%= call_hook :view_layouts_base_content %>
- <%= render :partial => 'layouts/base_footer'%> - + <%= render :partial => 'layouts/base_footer'%> <% end %> -