From 8aec3fe8f5a8bc1ea7619357dca63359a8071e9c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 27 Sep 2014 15:30:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AF=BE=E7=A8=8B=E5=B9=B4=E4=BB=BD=E4=BB=8E=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=B9=B4=E4=BB=BD=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index a005b299b..969fbceae 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -456,8 +456,8 @@ module CoursesHelper #课程实践年份下拉框 def course_time_option type = [] - #work_types = WorksCategory.all - for i in (2008..2020) + now_year = Time.now.year + for i in (now_year..now_year + 10) option = [] option << i option << i From 57835abb3734560644c9ec36f9633008e29e4616 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 27 Sep 2014 16:18:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E4=B8=8D=E8=83=BD=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 3 +- app/views/courses/settings/_members.html.erb | 50 ++++++++++++------- app/views/layouts/_join_exit_project.html.erb | 4 +- config/locales/zh.yml | 1 + 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index b05e0b286..793581664 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -251,6 +251,7 @@ module WatchersHelper end def exit_project_link(project) - link_to("退出项目",exit_cur_project_path(project.id),:remote => true ) + link_to(l(:label_exit_project),exit_cur_project_path(project.id), + :remote => true, :confirm => l(:lable_sure_exit_project) ) end end diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index d0c77ae83..a62a9c613 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -20,26 +20,34 @@ <% members.each do |member| %> <% next if member.new_record? %> - <%= link_to_user member.principal %> + + <%= link_to_user member.principal %> + - - <%= h member.roles.sort.collect(&:to_s).join(', ') %> - - <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), - :method => :put, - :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} + + <%= h member.roles.sort.collect(&:to_s).join(', ') %> + + <%= form_for(member, {:as => :membership, :remote => true, + :url => course_memberships_path(member),:method => :put, + :html => {:id => "member-#{member.id}-roles-form", + :class => 'hol'}} ) do |f| %> -

<% roles.each do |role| %> -
- <% end %>

+ +
+ <% end %> +

<%= hidden_field_tag 'membership[role_ids][]', '' %> -

<%= submit_tag l(:button_change), :class => "small" %> +

+ <%= submit_tag l(:button_change), :class => "small" %> <%= link_to_function l(:button_cancel), "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;" - %>

+ %> +

<% end %> @@ -71,8 +79,10 @@ <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@course), :remote => true, :method => :post}) do |f| %>
<%= l(:label_member_new) %> - -

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

+

+ <%= label_tag "principal_search", l(:label_principal_search) %> + <%= text_field_tag 'principal_search', nil %> +

<%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@course, :format => 'js') }')" %>
@@ -82,10 +92,12 @@

<%= l(:label_role_plural) %>: <% roles.each do |role| %> - - - <% end %>

- + + <% end %> +

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

<% end %> diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb index c43ad55a2..310d4ecd3 100644 --- a/app/views/layouts/_join_exit_project.html.erb +++ b/app/views/layouts/_join_exit_project.html.erb @@ -14,7 +14,9 @@
- <% if ((User.current.member_of? @project) && User.current.login?) %> + <% if ((User.current.member_of? @project) && + User.current.login? && + @project.members.where("user_id = #{User.current.id}").first.roles.first.to_s != "Manager") %> <%= exit_project_link(@project) %> <% end %>
\ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index fe3dd0fe1..e2ed6a045 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2139,3 +2139,4 @@ zh: lable_user_active: 用户动态 lable_bar_active: 贴吧动态 lable_student_list_visable: 学生列表是否公开 + lable_sure_exit_project: 是否确认退出该项目 From 27ad49282c442e89898af2dce7fb186b4021cf2f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 27 Sep 2014 16:43:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B1=82=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=80=80=E5=87=BA=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/views/layouts/_join_exit_project.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c40ac384a..6770d0c02 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -898,7 +898,7 @@ class ProjectsController < ApplicationController @project = Project.find params[:id] if User.current.login? members = Member.where(:user_id => User.current.id, :project_id=>params[:id]).first - if members != nil + if members != nil && members.roles.first.to_s != "Manager" members.destroy end respond_to do |format| diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb index 310d4ecd3..a2b928e15 100644 --- a/app/views/layouts/_join_exit_project.html.erb +++ b/app/views/layouts/_join_exit_project.html.erb @@ -16,7 +16,7 @@
<% if ((User.current.member_of? @project) && User.current.login? && - @project.members.where("user_id = #{User.current.id}").first.roles.first.to_s != "Manager") %> + Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s != "Manager") %> <%= exit_project_link(@project) %> <% end %>
\ No newline at end of file