From ff2b4c610c1e489ef502573bb84196bb124876fa Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 7 Mar 2015 11:30:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8A=A8=E6=80=81=E6=AF=8F=E9=A1=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9D=A1=E7=9B=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=202=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E9=97=BB=E3=80=81=E7=95=99=E8=A8=80=E7=AD=89=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=9A=84=E8=A1=A5=E5=85=A8=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=83=A8=E5=88=86=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b3e808b19..00af13cb5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -442,16 +442,24 @@ class UsersController < ApplicationController watcher.push(User.current) activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc') else - activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') + activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') + activity = activity.reject { |e| + !User.current.admin? && + (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) || + (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) || + (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) || + (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) || + (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))) + } end @activity_count = activity.count @activity_pages = Paginator.new @activity_count, pre_count, params['page'] - @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page ) - @activity = @activity.reject { |e| - ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) || - ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) || - ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?))) - } + @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page) + # @activity = @activity.reject { |e| + # ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) || + # ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) || + # ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?))) + # } @state = 0 end From 151fc561acacb98c6a69a2a1bf8da7920a87000f Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Sat, 7 Mar 2015 11:30:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=20Signed-off-by:=20alan=20<54753343?= =?UTF-8?q?4@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 5 +++-- app/views/mailer/send_invite_in_project.html.erb | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 14c01b93d..b404ea531 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -31,10 +31,11 @@ class Mailer < ActionMailer::Base # 发送邀请未注册用户加入项目邮件 # 功能： 在加入项目的同时自动注册用户 def send_invite_in_project(email, project, invitor) + @email = email @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} " - password = newpass(6) + @password = newpass(6) @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, - :password => password, :login => email) + :password => @password, :login => email) mail :to => email, :subject => @subject end diff --git a/app/views/mailer/send_invite_in_project.html.erb b/app/views/mailer/send_invite_in_project.html.erb index 980adc12d..6dbfcbda6 100644 --- a/app/views/mailer/send_invite_in_project.html.erb +++ b/app/views/mailer/send_invite_in_project.html.erb @@ -6,6 +6,10 @@

<%= @subject %>

<%= link_to @project_url, @project_url%>

+

点击链接后，将自动为您注册账号

+

您的账号为:<%= @email %>

+

密码为： <%= @password %>

+ From 6cf7e156d15d24f234561bae793dfe5e4ae5edc9 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Sat, 7 Mar 2015 11:35:57 +0800 Subject: [PATCH 3/7] Signed-off-by: alan <547533434@qq.com> --- app/controllers/projects_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 1428b4997..6ab757336 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -249,7 +249,7 @@ class ProjectsController < ApplicationController # Author lizanle # Description 项目动态展示方法，删除了不必要的代码 def show -=begin + # 试图跳转到请求的按钮 if params[:login] login = params[:login] @@ -265,7 +265,7 @@ class ProjectsController < ApplicationController if params[:jump] && redirect_to_project_menu_item(@project, params[:jump]) return end - +=begin cond = @project.project_condition(Setting.display_subprojects_issues?) has = { "show_issues" => true , From 945b9ff9cfd827bdb7e58790c8f9d4423199beff Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 7 Mar 2015 11:38:15 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8A=A8=E6=80=81=EF=BC=8C=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E4=BA=BA=E6=B2=A1=E6=9C=89=E8=BF=9B=E8=A1=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 00af13cb5..5e2f76705 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -443,15 +443,15 @@ class UsersController < ApplicationController activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc') else activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') - activity = activity.reject { |e| - !User.current.admin? && - (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) || - (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) || - (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) || - (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) || - (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))) - } end + activity = activity.reject { |e| + !User.current.admin? && + (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) || + (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) || + (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) || + (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) || + (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))) + } @activity_count = activity.count @activity_pages = Paginator.new @activity_count, pre_count, params['page'] @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page) From e8bdc13f24e7263375b0cf6afbd2b6d8f5de03e1 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 7 Mar 2015 12:25:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BC=BA=E9=99=B71975=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=BC=80project=20330=E7=9A=84=E6=97=B6=E5=80=99=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/show.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 6a47f07f0..37c7a81a7 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -21,7 +21,8 @@
<% unless @events_pages.empty? %> <% @events_pages.each do |e| -%> - <% act = e.forge_act %> + <% act = e.forge_act; + next if act.nil? %> <% if e.forge_act_type == "Issue" %>
From 77f81ac171e088952e50f8279751da6cd7fb1ea3 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 7 Mar 2015 14:32:34 +0800 Subject: [PATCH 6/7] =?UTF-8?q?kaminari=E5=88=86=E9=A1=B5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/kaminari_config.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb index 2ae42e414..5505662f3 100644 --- a/config/initializers/kaminari_config.rb +++ b/config/initializers/kaminari_config.rb @@ -23,10 +23,10 @@ Kaminari.configure do |config| # config.default_per_page = 25 # config.max_per_page = nil - # config.window = 4 + config.window = 2 # config.outer_window = 3 - # config.left = 0 - # config.right = 0 + # config.left = 2 + # config.right = 2 # config.page_method_name = :page # config.param_name = :page end From 3f3bb6267887968164e3e9ac00cf91cfc7a8d8df Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 7 Mar 2015 14:43:54 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=9D=9E=E9=A1=B9=E7=9B=AE=E6=88=90?= =?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=97=BB=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=8C=89=E9=92=AE=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_project_show.html.erb | 2 +- app/views/news/_project_news.html.erb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index 25903f588..9a3b79051 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -45,7 +45,7 @@ <%= link_to @topic_count,:controller => 'boards',:action => 'index' %> 个贴子 - <% if @project.enabled_modules.where("name = 'boards'").count > 0 %> + <% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %> <%= link_to l(:label_message_new), new_board_message_path(@board), diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb index b18c2abd8..4d20c62f7 100644 --- a/app/views/news/_project_news.html.erb +++ b/app/views/news/_project_news.html.erb @@ -70,11 +70,11 @@ <%= label_tips %> -<% if @project.enabled_modules.where("name = 'news'").count > 0 %> -<%= link_to(btn_tips, - new_project_news_path(@project), - :class => 'icon icon-add', - :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %> +<% if @project.enabled_modules.where("name = 'news'").count > 0 && User.current.member_of?(@project) %> + <%= link_to(btn_tips, + new_project_news_path(@project), + :class => 'icon icon-add', + :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %> <% end %> <% if @project && User.current.allowed_to?(:manage_news, @project) %>