From 24cdea1f347fbd06e5a704e6479684877d51ca7c Mon Sep 17 00:00:00 2001 From: z9hang Date: Sun, 28 Sep 2014 16:09:23 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=B4=B4=E5=90=A7=E8=B5=84=E6=BA=90=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E8=BD=BD=EF=BC=8C=E5=8E=9F=E5=9B=A0=EF=BC=9A?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=B5=84=E6=BA=90=E7=9A=84=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=9A=82=E6=9C=AA=E5=AE=9E=E7=8E=B0=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=88=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?true=EF=BC=8C=E8=AE=A8=E8=AE=BA=E5=8C=BA=E4=B8=BB=E9=A2=98...?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BF=87=E6=97=A9=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=9A=E5=A4=9A=E6=98=BE=E7=A4=BA=E5=87=A0=E4=B8=AA=E6=95=B0?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 8 +++++--- app/views/messages/_project_show.html.erb | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0b4309ef5..3ab894c69 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -258,11 +258,13 @@ class ApplicationController < ActionController::Base if @attachment.container_type == "Memo" allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true) elsif @attachment.container_type == "Project" - + return true elsif @attachment.container_type == "course" - + return true elsif @attachment.container_type == "contest" - + return true + else + return true end if allowed diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index eff5fa160..ad55e9be7 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -98,9 +98,9 @@
<% if @project %> - <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %> + <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(29, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %> <% elsif @course %> - <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %> + <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(29,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %> <% end %>
From 418615e7bc4af306f2c67293eec62f47edca86f3 Mon Sep 17 00:00:00 2001 From: z9hang Date: Sun, 28 Sep 2014 16:33:00 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=BE=E7=A8=8B=E6=96=B0=E9=97=BB=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=A1=B9=E8=A2=AB=E5=88=A0=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=9A=E9=87=8D=E6=96=B0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/redmine.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/redmine.rb b/lib/redmine.rb index c96464abc..d43973d2a 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -122,12 +122,12 @@ Redmine::AccessControl.map do |map| # map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin # map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true #end - #新闻权限与项目一致注释掉此处 - # map.course_module :news do |map| + + map.course_module :news do |map| # map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member - # map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true + map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true # map.permission :comment_news, {:comments => :create} - # end + end map.course_module :bids do |map| map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true,:belong_to_course => true From d998f80060aadb2b0c73d730449d87359cf46f69 Mon Sep 17 00:00:00 2001 From: z9hang Date: Sun, 28 Sep 2014 16:40:05 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E9=99=84=E4=BB=B6=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9D=83=E9=99=90=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=A2=AB=E5=88=A0=EF=BC=8C=E6=81=A2=E5=A4=8D=E4=B9=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/redmine.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/redmine.rb b/lib/redmine.rb index d43973d2a..a7d10262a 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -117,11 +117,11 @@ Redmine::AccessControl.map do |map| map.permission :projects_attachments_download,{:attachments => :download},:belong_to_project => true map.permission :course_attachments_download,{:attachments => :download},:belong_to_course => true map.permission :contest_attachments_download,{:attachments => :download},:belong_to_contest => true - #与项目一致，注释掉 - #map.course_module :files do |map| + + map.course_module :files do |map| # map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin - # map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true - #end + map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true + end map.course_module :news do |map| # map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member From 43e940eb1da55e13b60ed47d22082bb1e72659d4 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Sun, 28 Sep 2014 17:14:09 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E9=99=84=E4=BB=B6=E5=88=A0=E9=99=A4=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84bug=20Signed-off-by:=20alan=20<547533434@qq.c?= =?UTF-8?q?om>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 6 +- Gemfile.lock | 2 +- app/controllers/attachments_controller.rb | 8 +- app/helpers/courses_helper.rb | 1048 ++++++++--------- app/helpers/watchers_helper.rb | 514 ++++---- app/views/account/register.html.erb | 976 +++++++-------- app/views/bids/_homework_list.html.erb | 308 ++--- app/views/courses/_course_form.html.erb | 244 ++-- app/views/courses/settings/_members.html.erb | 210 ++-- app/views/layouts/_join_exit_project.html.erb | 42 +- app/views/roles/_form.html.erb | 138 +-- app/views/roles/permissions.html.erb | 298 ++--- lib/redmine.rb | 962 +++++++-------- lib/redmine/access_control.rb | 344 +++--- 14 files changed, 2551 insertions(+), 2549 deletions(-) diff --git a/Gemfile b/Gemfile index 12729f741..867c0fb75 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ -# source 'http://ruby.taobao.org' -source 'http://ruby.sdutlinux.org/' +source 'http://ruby.taobao.org' +#source 'http://ruby.sdutlinux.org/' unless RUBY_PLATFORM =~ /w32/ # unix-like only @@ -30,6 +30,7 @@ group :test do gem 'factory_girl', '~> 4.4.0' gem 'selenium-webdriver', '~> 2.42.0' + platforms :mri, :mingw do group :rmagick do # RMagick 2 supports ruby 1.9 @@ -48,6 +49,7 @@ group :development, :test do gem 'ruby-prof', '~> 0.15.1' unless RUBY_PLATFORM =~ /w32/ gem 'pry' gem 'pry-nav' + end diff --git a/Gemfile.lock b/Gemfile.lock index 00702d7c3..34314d845 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,7 +19,7 @@ PATH rails GEM - remote: http://ruby.sdutlinux.org/ + remote: http://ruby.taobao.org/ remote: https://rubygems.org/ specs: actionmailer (3.2.13) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 7ce9646c6..079a4e822 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -194,11 +194,11 @@ class AttachmentsController < ApplicationController format.html { redirect_to_referer_or course_path(@course) } end else - if @project.nil? - format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) } - else + # if @project.nil? + # format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) } + # else format.html { redirect_to_referer_or project_path(@project) } - end + # end end format.js diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 969fbceae..3a8b1b09a 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -1,524 +1,524 @@ -# encoding: utf-8 -## This helper be included in applicationHelper -module CoursesHelper -=begin -1. define TeacherRoles, StudentRoles -2. define count function -3. define search by roles -4. define search member function -=end - #TeacherRoles = [3, 4, 7, 9] - #StudentRoles = [5, 10] - #AllPeople = StudentRoles+TeacherRoles - ## return people count - - # 返回x项目成员数量，即roles表中定义的所有成员 - def projectCount project - #searchCountByRoles project, AllPeople - project.members.count - end - - # 返回教师数量，即roles表中定义的Manager - def teacherCount project - searchTeacherAndAssistant(project).count - # or - # searchTeacherAndAssistant(project).count - end - - # 返回学生数量，即roles表中定义的Reporter - #def studentCount project - # searchStudent(project).count - # or - # searchStudent(project).count - # end - - # 判断用户是否是课程的管理员 - # add by nwb - def is_course_manager?(user_id,course_id) - @result = false - @user_id = CourseInfo.find_by_course_id(course_id) - if @user_id == user.id - @result = true - end - return @result - end - - # 返回课程设置界面 - def course_settings_tabs - tabs = [{:name => 'info', :action => :edit_course, :partial => 'courses/edit', :label => :label_information_plural}, - {:name => 'members', :action => :manage_members, :partial => 'courses/settings/members', :label => :label_member_plural} - ] - tabs.select { |tab| User.current.allowed_to?(tab[:action], @course) } - - end - - #是否启动互评下拉框 - def is_evaluation_option - type = [] - option1 = [] - option2 = [] - option1 << l(:lable_start_mutual_evaluation) - option1 << 1 - option2 << l(:lable_close_mutual_evaluation) - option2 << 2 - type << option1 - type << option2 - end - - # garble count 混淆数量 - # alias projectCountOrigin projectCount - # def projectCount project - # count = projectCountOrigin project - # garble count - # end - - def homework_type_option - type = [] - option1 = [] - option2 = [] - option1 << l(:label_task_submit_form_accessory) - option1 << 1 - option2 << l(:label_task_submit_form_project) - option2 << 2 - type << option1 - type << option2 - end - - def proportion_option - type = [] - i = 0 - while i <= 100 - option = [] - option << i.to_s + "%" - option << i - type << option - i = i + 10 - end - type - end - - - #alias teacherCountOrigin teacherCount - #def teacherCount project - # count = teacherCountOrigin project - # garble count - #end - - # 注意：此方法有问题，速度慢且结果不准 - # alias studentCountOrigin studentCount - #def studentCount course - # count = studentCountOrigin course - #garble count - # end - - # 学生人数计算 - # add by nwb - def studentCount course - count = searchStudent(course).count#course.student.count - if count <= 5 - result = count.to_s - elsif count < 10 && count > 5 - result = "5+" - else - result = (count-count % 10).to_s + "+" - end - result - end - - #课程成员数计算 - def memberCount course - count = searchStudent(course).count + searchTeacherAndAssistant(course).count - if count <= 5 - result = count.to_s - elsif count < 10 && count > 5 - result = "5+" - else - result = (count-count % 10).to_s + "+" - end - result - end - - def eventToLanguageCourse event_type, course - case event_type - when "issue-note" - l :label_issue - when "issue" - l :label_issue - when "attachment" - l :label_attachment - when "news" - l :label_notification - else - "" - end - end - - def garble count - count = count.round( 1-count.to_s.size ).to_i - return count.to_s if count.to_s.size.eql?(1) - count.to_s << '+' - end - - # ===================================================================================== - # return people list - def searchTeacherAndAssistant project - #searchPeopleByRoles(project, TeacherRoles) - members = [] - project.members.each do |m| - members << m if m && m.user && m.user.allowed_to?(:as_teacher,project) - end - members - end - - def searchStudent project - #searchPeopleByRoles(project, StudentRoles) - members = [] - project.members.each do |m| - members << m if m && m.user && m.user.allowed_to?(:as_student,project) - end - members - end - # ===================================================================================== - - #def searchCountByRoles project, roles_id - # members = searchPeopleByRoles project, roles_id - # members.count - #end - - #def searchPeopleByRoles project, roles_id - # members = [] - # begin - # members = project.members.joins(:member_roles).where("member_roles.role_id IN (:role_id)", {:role_id => roles_id}) - # rescue Exception => e - # logger.error "[CoursesHelper] ===> #{e}" - # end - # members - #end - - def sort_courses(state) - content = ''.html_safe - case state - when 0 - - content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:courses_sort_type => '1'))) - content << content_tag('li', link_to(l(:label_sort_by_influence), courses_path(:courses_sort_type => '2'))) - content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:courses_sort_type => '0'), :class=>"selected"), :class=>"selected") - when 1 - - content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:courses_sort_type => '1'), :class=>"selected"), :class=>"selected") - content << content_tag('li', link_to(l(:label_sort_by_influence), courses_path(:courses_sort_type => '2'))) - content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:courses_sort_type => '0'))) - when 2 - content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:courses_sort_type => '1'))) - content << content_tag('li', link_to(l(:label_sort_by_influence), courses_path(:courses_sort_type => '2'), :class=>"selected"), :class=>"selected") - content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:courses_sort_type => '0'))) - end - content = content_tag('ul', content) - content_tag('div', content, :class => "tabs") - end - - def render_course_hierarchy(courses) - render_course_nested_lists(courses) do |course| - s = link_to_course(course, {}, :class => "#{course.css_classes} #{User.current.member_of?(course) ? 'my-course' : nil}").html_safe - s - end - end - - #useless - #def searchMembersByRole project, role_id - # members = [] - # begin - # members = project.members.joins(:member_roles).where("member_roles.role_id = :role_id", {:role_id => role_id }) - # rescue Exception => e - # logger.error "[CoursesHelper] ===> #{e}" - # end - # members - #end - - def sort_course(state, school_id) - content = ''.html_safe - case state - when 0 - content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0'), :school_id => school_id, :class=>"selected"), :class=>"selected") - content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id))) - content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id))) - - when 1 - content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0', :school_id => school_id))) - content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id), :class=>"selected"), :class=>"selected") - content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id))) - - when 2 - content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0', :school_id => school_id))) - content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id))) - content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id))) - - #gcm - when 3 - content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0', :school_id => school_id))) - content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id))) - content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id), :class=>"selected"), :class=>"selected") - end - #gcmend - - content = content_tag('ul', content) - content_tag('div', content, :class => "tabs") - end - - def findCourseTime project - str = "" - begin - @course = Course.find_by_extra(@project.identifier) - date_format = l(:zh_date)[:formats][:default] - if @course - str = DateTime.parse(@course.setup_time.to_s).strftime("#{date_format}").to_s unless @course.setup_time.blank? - str << '-' unless @course.setup_time.blank? - str << DateTime.parse(@course.endup_time.to_s).strftime("#{date_format}").to_s unless @course.endup_time.blank? - end - rescue Exception => e - logger.error "[CoursesHelper] ===> #{e}" - end - str - end - - # added by nwb - def get_course_term course - str = ( course.try(:time).to_s << '.' << course.try(:term).to_s ) - str[0..-4] - end - - def members_to_user_ids members - people = [] - members.each { |member| - people << member.user_id - } - people - end - # 截至到2014-03-17 这个是最终的判断课程是否过期的方法 - def course_endTime_timeout? course - end_time_str = course.try(:endup_time) - begin - cTime = Time.parse(end_time_str.to_s) - rescue TypeError,ArgumentError - cTime = Time.parse("3000-01-01") - end - now = Time.now - - now > cTime - end - def find_by_extra_from_project extra - Course.find_by_extra(try(extra)) - end - #判断指定用户是不是当前课程的老师 - def is_course_teacher (user,course) - #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{user.id}", {:role_id => TeacherRoles}).count != 0 - user.allowed_to?(:as_teacher,course) - #修改为根据用户是否有发布任务的权限来判断用户是否是课程的老师 - #is_teacher = false - #@membership = user.memberships.all(:conditions => Project.visible_condition(User.current)) - #@membership.each do |membership| - # unless(membership.project.project_type==0) - # if user.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) - # is_teacher = true - # end - # end - #end - #is_teacher - end - #当前用户是不是指定课程的学生 - def is_cur_course_student course - #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{User.current.id}", {:role_id => StudentRoles}).count != 0 - !(User.current.allowed_to?(:as_teacher,course)) - #修改：能新建占位且不能新建任务的角色判定为学生 - #is_student = false - #@membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current)) - #@membership.each do |membership| - # unless(membership.project.project_type==0) - # if !User.current.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) && User.current.allowed_to?({:controller => "homework_attach", :action => "new"}, membership.project, :global => false) - # is_student = true - # end - # end - #end - #is_student - end - #获取当前用户在指定作业下提交的作业的集合 - def cur_user_homework_for_bid bid - cur_user_homework = HomeworkAttach.where("user_id = ? and bid_id = ?",User.current,bid.id) - cur_user_homework - end - - #判断当前用户对指定作业是否已经评价过 - def has_evaluation? homework - seem_count = homework.rates(:quality).where("rater_id = ?",User.current).count - seem_count > 0 - end - - #获取指定作业的所有成员 - def users_for_homework homework - homework.nil? ? [] : (homework.users + [homework.user]) - end - - #获取指定作业的最终评分 - #最终评分 = 学生评分的平均分 * 0.4 +教师评分 * 0.6 - def score_for_homework homework - if homework.bid.is_evaluation == 1 || homework.bid.is_evaluation == nil - return format("%.2f",(homework.bid.proportion * 1.0 / 100) * (teacher_score_for_homework(homework).to_f) + (1 - homework.bid.proportion * 1.0 / 100) * (student_score_for_homework(homework).to_f)) - else - return teacher_score_for_homework homework - end - end - - #获取作业的互评得分 - def student_score_for_homework homework - #member = searchTeacherAndAssistant(homework.bid.courses.first).first#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first - #if member.nil? - # return "0.00" - #end - #student_stars = homework.rates(:quality).where("rater_id <> #{member.user_id}").select("stars") - members = searchStudent(homework.bid.courses.first) - user_ids = [] - members.each do |user| - user_ids << user.user_id - end - student_stars = homework.rates(:quality).where("rater_id in (:user_ids)",{:user_ids => user_ids}).select("stars") - student_stars_count = 0 - student_stars.each do |star| - student_stars_count = student_stars_count + star.stars - end - return format("%.2f",student_stars_count / (student_stars.count == 0 ? 1 : student_stars.count)) - - - - end - - #获取作业的教师评分 - #多个教师只获取一份教师评分 - def teacher_score_for_homework homework - members = searchTeacherAndAssistant(homework.bid.courses.first)#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first - #if member.nil? - # return "0.00" - #end - teacher_ids = [] - members.each do |user| - teacher_ids << user.user_id - end - teacher_stars = homework.rates(:quality).where("rater_id in (:teacher_ids)",{:teacher_ids => teacher_ids}).select("stars") - teacher_stars_count = 0 - teacher_stars.each do |star| - teacher_stars_count = teacher_stars_count + star.stars - end - return format("%.2f",teacher_stars_count) - end - - #获取指定项目的得分 - def project_score project - issue_count = project.issues.count - issue_journal_count = project.issue_changes.count - issue_score = issue_count * 0.2 - issue_journal_score = issue_journal_count * 0.1 - finall_issue_score = issue_score + issue_journal_score - new_count = project.news.count - new_score = new_count * 0.1 - finall_new_score = new_score - document_count = project.documents.count - file_score = document_count * 0.1 - finall_file_score = file_score - changeset_count = project.changesets.count - code_submit_score = changeset_count * 0.3 - finall_code_submit_score = code_submit_score - board_message_count = 0 - project.boards.each do |board| - board_message_count += board.messages_count - end - topic_score = board_message_count * 0.1 - #finall_topic_score = topic_score - finall_project_score = finall_issue_score + finall_new_score + finall_file_score + finall_code_submit_score + topic_score - format("%.2f",finall_project_score) - end - - #获取指定作业的参与人员 - #返回结果：张三、李四、王五 - def homework_user_of_homework homework,is_teacher - homework_users = "" - homework.users.each do |user| - homework_users = homework_users + (is_teacher ? (user.lastname + user.firstname) : user.login) - if user != homework.users.last - homework_users = homework_users + "、" - end - end - return homework_users - end - - def get_courses_by_tag(tag_name) - Course.tagged_with(tag_name).order('updated_at desc') - end - - #课程实践年份下拉框 - def course_time_option - type = [] - now_year = Time.now.year - for i in (now_year..now_year + 10) - option = [] - option << i - option << i - type << option - end - type - end - - #课程课时下拉框 - def course_term_option - type = [] - option1 = [] - option1 << l(:label_spring) - option1 << l(:label_spring) - option2 = [] - option2 << l(:label_autumn) - option2 << l(:label_autumn) - type << option1 - type << option2 - type - end - - #获取课程动态 - def get_course_activity courses, activities - @course_ids=activities.keys() - - days = Setting.activity_days_default.to_i - date_to ||= Date.today + 1 - date_from = date_to - days-1.years - - #file_count - Attachment.where(container_id: @course_ids, container_type: Course).where("created_on>?", date_from).each do |attachment| - activities[attachment.container_id]+=1 - end - - #message_count - Board.where(course_id: @course_ids).each do |board| -# activities[board.course_id]+=1 - activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count - end - - #news - News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news| - activities[news.course_id]+=1 - end - - #feedbackc_count - JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess| - activities[jourformess.jour_id]+=1 - end - - #activities!=0 - i=0; - courses.each do |course| - id=course.id - if activities[id]==0 - activities[id]=1 - end - end - - return activities - end - -end +# encoding: utf-8 +## This helper be included in applicationHelper +module CoursesHelper +=begin +1. define TeacherRoles, StudentRoles +2. define count function +3. define search by roles +4. define search member function +=end + #TeacherRoles = [3, 4, 7, 9] + #StudentRoles = [5, 10] + #AllPeople = StudentRoles+TeacherRoles + ## return people count + + # 返回x项目成员数量，即roles表中定义的所有成员 + def projectCount project + #searchCountByRoles project, AllPeople + project.members.count + end + + # 返回教师数量，即roles表中定义的Manager + def teacherCount project + searchTeacherAndAssistant(project).count + # or + # searchTeacherAndAssistant(project).count + end + + # 返回学生数量，即roles表中定义的Reporter + #def studentCount project + # searchStudent(project).count + # or + # searchStudent(project).count + # end + + # 判断用户是否是课程的管理员 + # add by nwb + def is_course_manager?(user_id,course_id) + @result = false + @user_id = CourseInfo.find_by_course_id(course_id) + if @user_id == user.id + @result = true + end + return @result + end + + # 返回课程设置界面 + def course_settings_tabs + tabs = [{:name => 'info', :action => :edit_course, :partial => 'courses/edit', :label => :label_information_plural}, + {:name => 'members', :action => :manage_members, :partial => 'courses/settings/members', :label => :label_member_plural} + ] + tabs.select { |tab| User.current.allowed_to?(tab[:action], @course) } + + end + + #是否启动互评下拉框 + def is_evaluation_option + type = [] + option1 = [] + option2 = [] + option1 << l(:lable_start_mutual_evaluation) + option1 << 1 + option2 << l(:lable_close_mutual_evaluation) + option2 << 2 + type << option1 + type << option2 + end + + # garble count 混淆数量 + # alias projectCountOrigin projectCount + # def projectCount project + # count = projectCountOrigin project + # garble count + # end + + def homework_type_option + type = [] + option1 = [] + option2 = [] + option1 << l(:label_task_submit_form_accessory) + option1 << 1 + option2 << l(:label_task_submit_form_project) + option2 << 2 + type << option1 + type << option2 + end + + def proportion_option + type = [] + i = 0 + while i <= 100 + option = [] + option << i.to_s + "%" + option << i + type << option + i = i + 10 + end + type + end + + + #alias teacherCountOrigin teacherCount + #def teacherCount project + # count = teacherCountOrigin project + # garble count + #end + + # 注意：此方法有问题，速度慢且结果不准 + # alias studentCountOrigin studentCount + #def studentCount course + # count = studentCountOrigin course + #garble count + # end + + # 学生人数计算 + # add by nwb + def studentCount course + count = searchStudent(course).count#course.student.count + if count <= 5 + result = count.to_s + elsif count < 10 && count > 5 + result = "5+" + else + result = (count-count % 10).to_s + "+" + end + result + end + + #课程成员数计算 + def memberCount course + count = searchStudent(course).count + searchTeacherAndAssistant(course).count + if count <= 5 + result = count.to_s + elsif count < 10 && count > 5 + result = "5+" + else + result = (count-count % 10).to_s + "+" + end + result + end + + def eventToLanguageCourse event_type, course + case event_type + when "issue-note" + l :label_issue + when "issue" + l :label_issue + when "attachment" + l :label_attachment + when "news" + l :label_notification + else + "" + end + end + + def garble count + count = count.round( 1-count.to_s.size ).to_i + return count.to_s if count.to_s.size.eql?(1) + count.to_s << '+' + end + + # ===================================================================================== + # return people list + def searchTeacherAndAssistant project + #searchPeopleByRoles(project, TeacherRoles) + members = [] + project.members.each do |m| + members << m if m && m.user && m.user.allowed_to?(:as_teacher,project) + end + members + end + + def searchStudent project + #searchPeopleByRoles(project, StudentRoles) + members = [] + project.members.each do |m| + members << m if m && m.user && m.user.allowed_to?(:as_student,project) + end + members + end + # ===================================================================================== + + #def searchCountByRoles project, roles_id + # members = searchPeopleByRoles project, roles_id + # members.count + #end + + #def searchPeopleByRoles project, roles_id + # members = [] + # begin + # members = project.members.joins(:member_roles).where("member_roles.role_id IN (:role_id)", {:role_id => roles_id}) + # rescue Exception => e + # logger.error "[CoursesHelper] ===> #{e}" + # end + # members + #end + + def sort_courses(state) + content = ''.html_safe + case state + when 0 + + content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:courses_sort_type => '1'))) + content << content_tag('li', link_to(l(:label_sort_by_influence), courses_path(:courses_sort_type => '2'))) + content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:courses_sort_type => '0'), :class=>"selected"), :class=>"selected") + when 1 + + content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:courses_sort_type => '1'), :class=>"selected"), :class=>"selected") + content << content_tag('li', link_to(l(:label_sort_by_influence), courses_path(:courses_sort_type => '2'))) + content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:courses_sort_type => '0'))) + when 2 + content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:courses_sort_type => '1'))) + content << content_tag('li', link_to(l(:label_sort_by_influence), courses_path(:courses_sort_type => '2'), :class=>"selected"), :class=>"selected") + content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:courses_sort_type => '0'))) + end + content = content_tag('ul', content) + content_tag('div', content, :class => "tabs") + end + + def render_course_hierarchy(courses) + render_course_nested_lists(courses) do |course| + s = link_to_course(course, {}, :class => "#{course.css_classes} #{User.current.member_of?(course) ? 'my-course' : nil}").html_safe + s + end + end + + #useless + #def searchMembersByRole project, role_id + # members = [] + # begin + # members = project.members.joins(:member_roles).where("member_roles.role_id = :role_id", {:role_id => role_id }) + # rescue Exception => e + # logger.error "[CoursesHelper] ===> #{e}" + # end + # members + #end + + def sort_course(state, school_id) + content = ''.html_safe + case state + when 0 + content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0'), :school_id => school_id, :class=>"selected"), :class=>"selected") + content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id))) + content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id))) + + when 1 + content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0', :school_id => school_id))) + content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id), :class=>"selected"), :class=>"selected") + content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id))) + + when 2 + content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0', :school_id => school_id))) + content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id))) + content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id))) + + #gcm + when 3 + content << content_tag('li', link_to(l(:label_sort_by_time), courses_path(:course_sort_type => '0', :school_id => school_id))) + content << content_tag('li', link_to(l(:label_sort_by_active), courses_path(:course_sort_type => '1', :school_id => school_id))) + content << content_tag('li', link_to(l(:label_sort_by_activity), courses_path(:course_sort_type => '3', :school_id => school_id), :class=>"selected"), :class=>"selected") + end + #gcmend + + content = content_tag('ul', content) + content_tag('div', content, :class => "tabs") + end + + def findCourseTime project + str = "" + begin + @course = Course.find_by_extra(@project.identifier) + date_format = l(:zh_date)[:formats][:default] + if @course + str = DateTime.parse(@course.setup_time.to_s).strftime("#{date_format}").to_s unless @course.setup_time.blank? + str << '-' unless @course.setup_time.blank? + str << DateTime.parse(@course.endup_time.to_s).strftime("#{date_format}").to_s unless @course.endup_time.blank? + end + rescue Exception => e + logger.error "[CoursesHelper] ===> #{e}" + end + str + end + + # added by nwb + def get_course_term course + str = ( course.try(:time).to_s << '.' << course.try(:term).to_s ) + str[0..-4] + end + + def members_to_user_ids members + people = [] + members.each { |member| + people << member.user_id + } + people + end + # 截至到2014-03-17 这个是最终的判断课程是否过期的方法 + def course_endTime_timeout? course + end_time_str = course.try(:endup_time) + begin + cTime = Time.parse(end_time_str.to_s) + rescue TypeError,ArgumentError + cTime = Time.parse("3000-01-01") + end + now = Time.now + + now > cTime + end + def find_by_extra_from_project extra + Course.find_by_extra(try(extra)) + end + #判断指定用户是不是当前课程的老师 + def is_course_teacher (user,course) + #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{user.id}", {:role_id => TeacherRoles}).count != 0 + user.allowed_to?(:as_teacher,course) + #修改为根据用户是否有发布任务的权限来判断用户是否是课程的老师 + #is_teacher = false + #@membership = user.memberships.all(:conditions => Project.visible_condition(User.current)) + #@membership.each do |membership| + # unless(membership.project.project_type==0) + # if user.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) + # is_teacher = true + # end + # end + #end + #is_teacher + end + #当前用户是不是指定课程的学生 + def is_cur_course_student course + #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{User.current.id}", {:role_id => StudentRoles}).count != 0 + !(User.current.allowed_to?(:as_teacher,course)) + #修改：能新建占位且不能新建任务的角色判定为学生 + #is_student = false + #@membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current)) + #@membership.each do |membership| + # unless(membership.project.project_type==0) + # if !User.current.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) && User.current.allowed_to?({:controller => "homework_attach", :action => "new"}, membership.project, :global => false) + # is_student = true + # end + # end + #end + #is_student + end + #获取当前用户在指定作业下提交的作业的集合 + def cur_user_homework_for_bid bid + cur_user_homework = HomeworkAttach.where("user_id = ? and bid_id = ?",User.current,bid.id) + cur_user_homework + end + + #判断当前用户对指定作业是否已经评价过 + def has_evaluation? homework + seem_count = homework.rates(:quality).where("rater_id = ?",User.current).count + seem_count > 0 + end + + #获取指定作业的所有成员 + def users_for_homework homework + homework.nil? ? [] : (homework.users + [homework.user]) + end + + #获取指定作业的最终评分 + #最终评分 = 学生评分的平均分 * 0.4 +教师评分 * 0.6 + def score_for_homework homework + if homework.bid.is_evaluation == 1 || homework.bid.is_evaluation == nil + return format("%.2f",(homework.bid.proportion * 1.0 / 100) * (teacher_score_for_homework(homework).to_f) + (1 - homework.bid.proportion * 1.0 / 100) * (student_score_for_homework(homework).to_f)) + else + return teacher_score_for_homework homework + end + end + + #获取作业的互评得分 + def student_score_for_homework homework + #member = searchTeacherAndAssistant(homework.bid.courses.first).first#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first + #if member.nil? + # return "0.00" + #end + #student_stars = homework.rates(:quality).where("rater_id <> #{member.user_id}").select("stars") + members = searchStudent(homework.bid.courses.first) + user_ids = [] + members.each do |user| + user_ids << user.user_id + end + student_stars = homework.rates(:quality).where("rater_id in (:user_ids)",{:user_ids => user_ids}).select("stars") + student_stars_count = 0 + student_stars.each do |star| + student_stars_count = student_stars_count + star.stars + end + return format("%.2f",student_stars_count / (student_stars.count == 0 ? 1 : student_stars.count)) + + + + end + + #获取作业的教师评分 + #多个教师只获取一份教师评分 + def teacher_score_for_homework homework + members = searchTeacherAndAssistant(homework.bid.courses.first)#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first + #if member.nil? + # return "0.00" + #end + teacher_ids = [] + members.each do |user| + teacher_ids << user.user_id + end + teacher_stars = homework.rates(:quality).where("rater_id in (:teacher_ids)",{:teacher_ids => teacher_ids}).select("stars") + teacher_stars_count = 0 + teacher_stars.each do |star| + teacher_stars_count = teacher_stars_count + star.stars + end + return format("%.2f",teacher_stars_count) + end + + #获取指定项目的得分 + def project_score project + issue_count = project.issues.count + issue_journal_count = project.issue_changes.count + issue_score = issue_count * 0.2 + issue_journal_score = issue_journal_count * 0.1 + finall_issue_score = issue_score + issue_journal_score + new_count = project.news.count + new_score = new_count * 0.1 + finall_new_score = new_score + document_count = project.documents.count + file_score = document_count * 0.1 + finall_file_score = file_score + changeset_count = project.changesets.count + code_submit_score = changeset_count * 0.3 + finall_code_submit_score = code_submit_score + board_message_count = 0 + project.boards.each do |board| + board_message_count += board.messages_count + end + topic_score = board_message_count * 0.1 + #finall_topic_score = topic_score + finall_project_score = finall_issue_score + finall_new_score + finall_file_score + finall_code_submit_score + topic_score + format("%.2f",finall_project_score) + end + + #获取指定作业的参与人员 + #返回结果：张三、李四、王五 + def homework_user_of_homework homework,is_teacher + homework_users = "" + homework.users.each do |user| + homework_users = homework_users + (is_teacher ? (user.lastname + user.firstname) : user.login) + if user != homework.users.last + homework_users = homework_users + "、" + end + end + return homework_users + end + + def get_courses_by_tag(tag_name) + Course.tagged_with(tag_name).order('updated_at desc') + end + + #课程实践年份下拉框 + def course_time_option + type = [] + now_year = Time.now.year + for i in (now_year..now_year + 10) + option = [] + option << i + option << i + type << option + end + type + end + + #课程课时下拉框 + def course_term_option + type = [] + option1 = [] + option1 << l(:label_spring) + option1 << l(:label_spring) + option2 = [] + option2 << l(:label_autumn) + option2 << l(:label_autumn) + type << option1 + type << option2 + type + end + + #获取课程动态 + def get_course_activity courses, activities + @course_ids=activities.keys() + + days = Setting.activity_days_default.to_i + date_to ||= Date.today + 1 + date_from = date_to - days-1.years + + #file_count + Attachment.where(container_id: @course_ids, container_type: Course).where("created_on>?", date_from).each do |attachment| + activities[attachment.container_id]+=1 + end + + #message_count + Board.where(course_id: @course_ids).each do |board| +# activities[board.course_id]+=1 + activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count + end + + #news + News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news| + activities[news.course_id]+=1 + end + + #feedbackc_count + JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess| + activities[jourformess.jour_id]+=1 + end + + #activities!=0 + i=0; + courses.each do |course| + id=course.id + if activities[id]==0 + activities[id]=1 + end + end + + return activities + end + +end diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 793581664..56b2ec0f4 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -1,257 +1,257 @@ -# encoding: utf-8 -# -# Redmine - project management software -# Copyright (C) 2006-2013 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -module WatchersHelper - - def watcher_tag(object, user, options={}) - ActiveSupport::Deprecation.warn "#watcher_tag is deprecated and will be removed in Redmine 3.0. Use #watcher_link instead." - watcher_link(object, user) - end - - ###################modified by liuping, nyan - def watcher_link(objects, user, options=[]) - return '' unless user && user.logged? - objects = Array.wrap(objects) - - watched = objects.any? {|object| object.watched_by?(user)} - @watch_flag = (objects.first.instance_of?(User) or objects.first.instance_of?(Project) or objects.first.instance_of?(Contest) or (objects.first.instance_of?(Bid))) - css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : - ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s) - - text = @watch_flag ? - (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) - - url = watch_path( - :object_type => objects.first.class.to_s.underscore, - :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort) - ) - method = watched ? 'delete' : 'post' - - link_to text, url, :remote => true, :method => method, :class => css - end - - ############## added by linchun - def new_watcher_link(objects, user, options=[]) - return '' unless user && user.logged? - objects = Array.wrap(objects) - - watched = objects.any? {|object| object.watched_by?(user)} - @watch_flag = (objects.first.instance_of?(User) or objects.first.instance_of?(Project) or (objects.first.instance_of?(Contest))) - css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : - ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s) - - text = @watch_flag ? - (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) - - url = watch_path( - :object_type => objects.first.class.to_s.underscore, - :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort) - ) - method = watched ? 'delete' : 'post' - - link_to text, url, :remote => true, :method => method, :class => css - end - - # add by nwb - # 关注课程 - def new_course_watcher_link(objects, user, options=[]) - return '' unless user && user.logged? - objects = Array.wrap(objects) - - watched = objects.any? {|object| object.watched_by?(user)} - @watch_flag = (objects.first.instance_of?(User) or objects.first.instance_of?(Project) or (objects.first.instance_of?(Contest))) - css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : - ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s) - - text = @watch_flag ? - (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) - - url = watch_path( - :object_type => objects.first.class.to_s.underscore, - :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort) - ) - method = watched ? 'delete' : 'post' - - link_to text, url, :remote => true, :method => method, :class => css - end - - # added by fq, modify nyan - # Somebody may use option params - def join_in_course(course, user, options=[]) - return '' unless user && user.logged? - # modify by nwb - # 主讲教师不允许退出课程 - return '' if user.id == course.tea_id - joined = user.member_of_course?(course) - text = joined ? l(:label_exit_course) : l(:label_join_course) - url_t = join_path(:object_id => course.id) - url_f = try_join_path(:object_id => course.id) - method = joined ? 'delete' : 'post' - if joined - link_to text, url_t, :remote => true, :method => method, :id => "#{course.id}", :confirm => l(:text_are_you_sure_out), :class => []+options - else - link_to text, url_f, :remote => true, :method => method, :id => "#{course.id}", :class => []+options - end - end - - # 用户是否允许加入课程判断 - # add by nwb - def join_in_course_for_list(course, user, options=[]) - return '' unless user && user.logged? - # modify by nwb - # 主讲教师不允许退出课程 - return '' if user.id == course.tea_id - joined = user.member_of_course?(course) - text = joined ? l(:label_exit_course) : l(:label_join_course) - url_t = join_path(:object_id => course.id) - url_f = try_join_path(:object_id => course.id) - method = joined ? 'delete' : 'post' - if joined - link_to text, url_t, :remote => true, :method => method, :id => "#{course.id}", :confirm => l(:text_are_you_sure_out), :class => []+options - else - link_to text, url_f, :remote => true, :method => method, :id => "#{course.id}", :class => []+options - end - end - - #added by bai - def join_in_contest(bid, user, options=[]) - if bid.reward_type == 2 - return '' unless user && user.logged? - joined = user.join_in_contest?(bid) - text = joined ? l(:label_exit_contest) : l(:label_join_contest) - url_t = join_in_contest_path(:id => bid.id) - url_f = try_join_in_contest_path(:id => bid.id) - # url = join_in_contest_path(:id => bid.id) - method = joined ? 'delete' : 'post' - if joined - link_to text, url_t, :remote => true, :method => method, :id => "#{bid.id}", :confirm => l(:text_are_you_sure_out), :class => []+options - else - link_to text, url_f, :remote => true, :method => method, :id => "#{bid.id}", :class => []+options - end - end - end - ##new add by linchun - def join_in_contest(contest, user, options=[]) - return '' unless user && user.logged? - joined = user.join_in_contest?(contest) - text = joined ? l(:label_exit_contest) : l(:label_join_contest) - url_t = join_in_contest_path(:id => contest.id) - url_f = try_join_in_contest_path(:id => contest.id) - # url = join_in_contest_path(:id => contest.id) - method = joined ? 'delete' : 'post' - if joined - link_to text, url_t, :remote => true, :method => method, :id => "#{contest.id}", :confirm => l(:text_are_you_sure_out), :class => []+options - else - link_to text, url_f, :remote => true, :method => method, :id => "#{contest.id}", :class => []+options - end - end - - # liuwanwei 的需求， 新竞赛 - # 新路由命名为 competition - def join_in_competition(competition, user) - return '' unless user && user.logged? - joined = JoinInCompetition.where('competition_id = ? AND user_id = ?', competition.id, user.id).count>0 - text = joined ? l(:label_exit_contest) : l(:label_join_contest) - url_f = new_join_contests_path(:id => competition.id) - url_t = unjoin_in_contest_contests_path(:id => competition.id) - method = joined ? 'delete' : 'post' - if joined - # 退出竞赛用 - link_to text, url_t, :remote => true, :method => method, :id => "#{competition.id}", :confirm => l(:text_are_you_sure_out) - else - # 加入竞赛用 - link_to text, url_f, :remote => true, :method => method, :id => "#{competition.id}" - end - end - - # Returns the css class used to identify watch links for a given +object+ - def watcher_css(objects) - objects = Array.wrap(objects) - id = (objects.size == 1 ? objects.first.id : 'bulk') - "#{objects.first.class.to_s.underscore}-#{id}-watcher" - end - - # Returns a comma separated list of users watching the given object - def watchers_list(object) - remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project) - content = ''.html_safe - lis = object.watcher_users.collect do |user| - s = ''.html_safe - s << avatar(user, :size => "16").to_s - s << link_to_user(user, :class => 'user') - if remove_allowed - url = {:controller => 'watchers', - :action => 'destroy', - :object_type => object.class.to_s.underscore, - :object_id => object.id, - :user_id => user} - s << ' ' - s << link_to(image_tag('delete.png'), url, - :remote => true, :method => 'delete', :class => "delete") - end - content << content_tag('li', s, :class => "user-#{user.id}") - end - content.present? ? content_tag('ul', content, :class => 'watchers') : content - end - - def watchers_checkboxes(object, users, checked=nil) - if users.nil? - - else - users.map do |user| - c = checked.nil? ? object.watched_by?(user) : checked - tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil - content_tag 'label', "#{tag} #{h(user)}".html_safe, - :id => "issue_watcher_user_ids_#{user.id}", - :class => "floating" - end.join.html_safe - end - end - - def applied_css(project) - id = project.id - "#{project.class.to_s.underscore}-#{id}-applied" - end - - def applied_link(project, user, options=[]) - return '' unless user && user.logged? - applied = project.applied_projects.find_by_user_id(user.id) - text = applied ? l(:label_unapply_project) : l(:label_apply_project) - - @applied_flag = project.instance_of?(Project) - css = @applied_flag ? ([applied_css(project), applied ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : - ([applied_css(project), applied ? 'icon icon-applied ' : 'icon icon-applied-off '].join(' ') << options[0].to_s) - if applied - appliedid = applied.id - end - url = appliedproject_path( - :id=>appliedid, - :user_id => user.id, - :project_id => project.id - ) - method = applied ? 'delete' : 'post' - - link_to text, url, :remote => true, :method => method ,:class=>css - end - - def exit_project_link(project) - link_to(l(:label_exit_project),exit_cur_project_path(project.id), - :remote => true, :confirm => l(:lable_sure_exit_project) ) - end - end +# encoding: utf-8 +# +# Redmine - project management software +# Copyright (C) 2006-2013 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +module WatchersHelper + + def watcher_tag(object, user, options={}) + ActiveSupport::Deprecation.warn "#watcher_tag is deprecated and will be removed in Redmine 3.0. Use #watcher_link instead." + watcher_link(object, user) + end + + ###################modified by liuping, nyan + def watcher_link(objects, user, options=[]) + return '' unless user && user.logged? + objects = Array.wrap(objects) + + watched = objects.any? {|object| object.watched_by?(user)} + @watch_flag = (objects.first.instance_of?(User) or objects.first.instance_of?(Project) or objects.first.instance_of?(Contest) or (objects.first.instance_of?(Bid))) + css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : + ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s) + + text = @watch_flag ? + (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) + + url = watch_path( + :object_type => objects.first.class.to_s.underscore, + :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort) + ) + method = watched ? 'delete' : 'post' + + link_to text, url, :remote => true, :method => method, :class => css + end + + ############## added by linchun + def new_watcher_link(objects, user, options=[]) + return '' unless user && user.logged? + objects = Array.wrap(objects) + + watched = objects.any? {|object| object.watched_by?(user)} + @watch_flag = (objects.first.instance_of?(User) or objects.first.instance_of?(Project) or (objects.first.instance_of?(Contest))) + css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : + ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s) + + text = @watch_flag ? + (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) + + url = watch_path( + :object_type => objects.first.class.to_s.underscore, + :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort) + ) + method = watched ? 'delete' : 'post' + + link_to text, url, :remote => true, :method => method, :class => css + end + + # add by nwb + # 关注课程 + def new_course_watcher_link(objects, user, options=[]) + return '' unless user && user.logged? + objects = Array.wrap(objects) + + watched = objects.any? {|object| object.watched_by?(user)} + @watch_flag = (objects.first.instance_of?(User) or objects.first.instance_of?(Project) or (objects.first.instance_of?(Contest))) + css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : + ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s) + + text = @watch_flag ? + (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) + + url = watch_path( + :object_type => objects.first.class.to_s.underscore, + :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort) + ) + method = watched ? 'delete' : 'post' + + link_to text, url, :remote => true, :method => method, :class => css + end + + # added by fq, modify nyan + # Somebody may use option params + def join_in_course(course, user, options=[]) + return '' unless user && user.logged? + # modify by nwb + # 主讲教师不允许退出课程 + return '' if user.id == course.tea_id + joined = user.member_of_course?(course) + text = joined ? l(:label_exit_course) : l(:label_join_course) + url_t = join_path(:object_id => course.id) + url_f = try_join_path(:object_id => course.id) + method = joined ? 'delete' : 'post' + if joined + link_to text, url_t, :remote => true, :method => method, :id => "#{course.id}", :confirm => l(:text_are_you_sure_out), :class => []+options + else + link_to text, url_f, :remote => true, :method => method, :id => "#{course.id}", :class => []+options + end + end + + # 用户是否允许加入课程判断 + # add by nwb + def join_in_course_for_list(course, user, options=[]) + return '' unless user && user.logged? + # modify by nwb + # 主讲教师不允许退出课程 + return '' if user.id == course.tea_id + joined = user.member_of_course?(course) + text = joined ? l(:label_exit_course) : l(:label_join_course) + url_t = join_path(:object_id => course.id) + url_f = try_join_path(:object_id => course.id) + method = joined ? 'delete' : 'post' + if joined + link_to text, url_t, :remote => true, :method => method, :id => "#{course.id}", :confirm => l(:text_are_you_sure_out), :class => []+options + else + link_to text, url_f, :remote => true, :method => method, :id => "#{course.id}", :class => []+options + end + end + + #added by bai + def join_in_contest(bid, user, options=[]) + if bid.reward_type == 2 + return '' unless user && user.logged? + joined = user.join_in_contest?(bid) + text = joined ? l(:label_exit_contest) : l(:label_join_contest) + url_t = join_in_contest_path(:id => bid.id) + url_f = try_join_in_contest_path(:id => bid.id) + # url = join_in_contest_path(:id => bid.id) + method = joined ? 'delete' : 'post' + if joined + link_to text, url_t, :remote => true, :method => method, :id => "#{bid.id}", :confirm => l(:text_are_you_sure_out), :class => []+options + else + link_to text, url_f, :remote => true, :method => method, :id => "#{bid.id}", :class => []+options + end + end + end + ##new add by linchun + def join_in_contest(contest, user, options=[]) + return '' unless user && user.logged? + joined = user.join_in_contest?(contest) + text = joined ? l(:label_exit_contest) : l(:label_join_contest) + url_t = join_in_contest_path(:id => contest.id) + url_f = try_join_in_contest_path(:id => contest.id) + # url = join_in_contest_path(:id => contest.id) + method = joined ? 'delete' : 'post' + if joined + link_to text, url_t, :remote => true, :method => method, :id => "#{contest.id}", :confirm => l(:text_are_you_sure_out), :class => []+options + else + link_to text, url_f, :remote => true, :method => method, :id => "#{contest.id}", :class => []+options + end + end + + # liuwanwei 的需求， 新竞赛 + # 新路由命名为 competition + def join_in_competition(competition, user) + return '' unless user && user.logged? + joined = JoinInCompetition.where('competition_id = ? AND user_id = ?', competition.id, user.id).count>0 + text = joined ? l(:label_exit_contest) : l(:label_join_contest) + url_f = new_join_contests_path(:id => competition.id) + url_t = unjoin_in_contest_contests_path(:id => competition.id) + method = joined ? 'delete' : 'post' + if joined + # 退出竞赛用 + link_to text, url_t, :remote => true, :method => method, :id => "#{competition.id}", :confirm => l(:text_are_you_sure_out) + else + # 加入竞赛用 + link_to text, url_f, :remote => true, :method => method, :id => "#{competition.id}" + end + end + + # Returns the css class used to identify watch links for a given +object+ + def watcher_css(objects) + objects = Array.wrap(objects) + id = (objects.size == 1 ? objects.first.id : 'bulk') + "#{objects.first.class.to_s.underscore}-#{id}-watcher" + end + + # Returns a comma separated list of users watching the given object + def watchers_list(object) + remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project) + content = ''.html_safe + lis = object.watcher_users.collect do |user| + s = ''.html_safe + s << avatar(user, :size => "16").to_s + s << link_to_user(user, :class => 'user') + if remove_allowed + url = {:controller => 'watchers', + :action => 'destroy', + :object_type => object.class.to_s.underscore, + :object_id => object.id, + :user_id => user} + s << ' ' + s << link_to(image_tag('delete.png'), url, + :remote => true, :method => 'delete', :class => "delete") + end + content << content_tag('li', s, :class => "user-#{user.id}") + end + content.present? ? content_tag('ul', content, :class => 'watchers') : content + end + + def watchers_checkboxes(object, users, checked=nil) + if users.nil? + + else + users.map do |user| + c = checked.nil? ? object.watched_by?(user) : checked + tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil + content_tag 'label', "#{tag} #{h(user)}".html_safe, + :id => "issue_watcher_user_ids_#{user.id}", + :class => "floating" + end.join.html_safe + end + end + + def applied_css(project) + id = project.id + "#{project.class.to_s.underscore}-#{id}-applied" + end + + def applied_link(project, user, options=[]) + return '' unless user && user.logged? + applied = project.applied_projects.find_by_user_id(user.id) + text = applied ? l(:label_unapply_project) : l(:label_apply_project) + + @applied_flag = project.instance_of?(Project) + css = @applied_flag ? ([applied_css(project), applied ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : + ([applied_css(project), applied ? 'icon icon-applied ' : 'icon icon-applied-off '].join(' ') << options[0].to_s) + if applied + appliedid = applied.id + end + url = appliedproject_path( + :id=>appliedid, + :user_id => user.id, + :project_id => project.id + ) + method = applied ? 'delete' : 'post' + + link_to text, url, :remote => true, :method => method ,:class=>css + end + + def exit_project_link(project) + 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/account/register.html.erb b/app/views/account/register.html.erb index 27732b549..f53f31f80 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -1,489 +1,489 @@ -<% @nav_dispaly_home_path_label = 1 - @nav_dispaly_main_course_label = 1 - @nav_dispaly_main_project_label = 1 - @nav_dispaly_main_contest_label = 1 %> -<% @nav_dispaly_forum_label = 1%> - - - - - - - -

<%= l(:label_register) %> <%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %>

- -<%= labelled_form_for @user, :url => register_path do |f| %> - <%= error_messages_for 'user' %> -
-

- - - - - - -
- <%= l(:label_identity) %> * - - - - -
-

- <% if @user.auth_source_id.nil? %> -

<%= f.text_field :login, :size => 25, :required => true %> - <%= l(:label_max_number) %> -

-

<%= f.password_field :password, :size => 25, :required => true %> - <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %> -

-

<%= f.password_field :password_confirmation, :size => 25, :required => true %>

- <% end %> - - -

- <%= f.text_field :mail, :required => true %> - -

-

- <%= "#{l(:label_mail_attention)} " %> -

-

<%= f.select :language, lang_options_for_select, :required => true %>

- - - -

- - - - - - -
- <%= l(:label_location) %> * - - - - -
-

- -
- -

- - - - -
<%= submit_tag l(:button_submit) %>
-

-<% end %> -<% if Setting.openid? %> -

<%= f.text_field :identity_url %>

-<% end %> -<% @user.custom_field_values.select { |v| v.editable? || v.required? }.each do |value| %> -

<%= custom_field_tag_with_label :user, value %>

-<% end %> -
- + + + + + +

<%= l(:label_register) %> <%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %>

+ +<%= labelled_form_for @user, :url => register_path do |f| %> + <%= error_messages_for 'user' %> +
+

+ + + + + + +
+ <%= l(:label_identity) %> * + + + + +
+

+ <% if @user.auth_source_id.nil? %> +

<%= f.text_field :login, :size => 25, :required => true %> + <%= l(:label_max_number) %> +

+

<%= f.password_field :password, :size => 25, :required => true %> + <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %> +

+

<%= f.password_field :password_confirmation, :size => 25, :required => true %>

+ <% end %> + + +

+ <%= f.text_field :mail, :required => true %> + +

+

+ <%= "#{l(:label_mail_attention)} " %> +

+

<%= f.select :language, lang_options_for_select, :required => true %>

+ + + +

+ + + + + + +
+ <%= l(:label_location) %> * + + + + +
+

+ +
+ +

+ + + + +
<%= submit_tag l(:button_submit) %>
+

+<% end %> +<% if Setting.openid? %> +

<%= f.text_field :identity_url %>

+<% end %> +<% @user.custom_field_values.select { |v| v.editable? || v.required? }.each do |value| %> +

<%= custom_field_tag_with_label :user, value %>

+<% end %> +
+ \ No newline at end of file diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index aae4a63b8..9bf997cbe 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -1,155 +1,155 @@ - -<% is_student = is_cur_course_student(@bid.courses.first) %> -<% is_teacher = is_course_teacher(User.current,@bid.courses.first) %> - -<% is_evaluation = @bid.is_evaluation == 1 || @bid.is_evaluation == nil %> -<%= form_tag(:controller => 'bids', :action => "show_courseEx", :method => :get) do %> -
- - - - - -
<%= l(:label_task_plural)%>(<%= @homework_list.count%>) - <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(is_teacher && @bid.homeworks.count > 0) %> - -
- <% if is_teacher %> - <%= text_field_tag 'student_id', params[:student_id], :size => 30 %> - <%= submit_tag l(:label_search_by_student_id), :class => "small", :name => nil %> - <% end %> -
-
-
-<% end %> -<% display_id = im_watching_student_id? @bid%> -<% @homework_list.each do |homework|%> - - - - - -
- - <% user_name = is_teacher ? (homework.user.lastname + homework.user.firstname) : homework.user.login %> - - - - - - - - - - -
<%= image_tag(url_to_avatar(homework.user), :class => "avatar")%>
-

- <%= link_to user_name, user_path(homework.user),{:style => "color:#727272"} %> -

-
- <% if (users_for_homework(homework).include?(User.current) || is_teacher) %> - <%= link_to l(:button_edit), edit_homework_attach_path(homework) %> - <% if homework.user == User.current || is_teacher %> - <%= link_to(l(:label_bid_respond_delete), homework, - method: :delete, :confirm => l(:text_are_you_sure)) %> - <% end %> - <% end %> -
- - 		- - - - - - - - - - - - - - - - - - - - -
- 作品名称:  - <% if homework.name == nil || homework.name == "" %> - <% homework_filename = homework.user.name + "提交的作业" %> - <% else %> - <% homework_filename = homework.name %> - <% end %> - - <%= link_to homework_filename , homework_attach_path(homework)%> - - - 合作成员:  - <% homework_users = homework_user_of_homework(homework,is_teacher) %> - <% if homework.users.count == 0 %> - 无 - <% else %> - <%= homework_users %> - <% end %> - - <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> - 迟交 - <% end %> -
- 开发项目:  - <% if homework.project != nil %> - - <%= link_to homework.project.name,project_path(homework.project.id)%> - - <% else %> - 暂无 - <% end %> - - 项目得分:  - ;"> - <%= homework.project.nil? ? "N/A" : project_scores(homework.project) %> - - -
- 提交文件:  - <% if is_evaluation || is_teacher%> - <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> - <% else %> - 未开启互评功能作业不允许下载 - <% end %> - - - 互评得分:  - <%# student_homework_score = student_score_for_homework(homework) %> - ;"> - <% score = homework.s_score.nil? ? "N/A" : format("%.2f",homework.s_score) %> - <%= score %> -    - <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%> - <%= link_to "学生互评>>",homework_attach_path(homework) %> - <% end %> - -
- <% if is_evaluation || is_teacher%> - <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> - <% end %> - - 终评得分:  - <%# totle_homework_score = score_for_homework(homework) %> - <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * (@bid.proportion * 1.0 / 100) + (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - @bid.proportion * 1.0 / 100)) %> - ;"> - <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score %> - <%= score %> -    - <% if is_teacher %> - <%= link_to "教师评分>>",homework_attach_path(homework) %> - <% end %> - -
-
-
+ +<% is_student = is_cur_course_student(@bid.courses.first) %> +<% is_teacher = is_course_teacher(User.current,@bid.courses.first) %> + +<% is_evaluation = @bid.is_evaluation == 1 || @bid.is_evaluation == nil %> +<%= form_tag(:controller => 'bids', :action => "show_courseEx", :method => :get) do %> +
+ + + + + +
<%= l(:label_task_plural)%>(<%= @homework_list.count%>) + <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(is_teacher && @bid.homeworks.count > 0) %> + +
+ <% if is_teacher %> + <%= text_field_tag 'student_id', params[:student_id], :size => 30 %> + <%= submit_tag l(:label_search_by_student_id), :class => "small", :name => nil %> + <% end %> +
+
+
+<% end %> +<% display_id = im_watching_student_id? @bid%> +<% @homework_list.each do |homework|%> + + + + + +
+ + <% user_name = is_teacher ? (homework.user.lastname + homework.user.firstname) : homework.user.login %> + + + + + + + + + + +
<%= image_tag(url_to_avatar(homework.user), :class => "avatar")%>
+

+ <%= link_to user_name, user_path(homework.user),{:style => "color:#727272"} %> +

+
+ <% if (users_for_homework(homework).include?(User.current) || is_teacher) %> + <%= link_to l(:button_edit), edit_homework_attach_path(homework) %> + <% if homework.user == User.current || is_teacher %> + <%= link_to(l(:label_bid_respond_delete), homework, + method: :delete, :confirm => l(:text_are_you_sure)) %> + <% end %> + <% end %> +
+ + 		+ + + + + + + + + + + + + + + + + + + + +
+ 作品名称:  + <% if homework.name == nil || homework.name == "" %> + <% homework_filename = homework.user.name + "提交的作业" %> + <% else %> + <% homework_filename = homework.name %> + <% end %> + + <%= link_to homework_filename , homework_attach_path(homework)%> + + + 合作成员:  + <% homework_users = homework_user_of_homework(homework,is_teacher) %> + <% if homework.users.count == 0 %> + 无 + <% else %> + <%= homework_users %> + <% end %> + + <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> + 迟交 + <% end %> +
+ 开发项目:  + <% if homework.project != nil %> + + <%= link_to homework.project.name,project_path(homework.project.id)%> + + <% else %> + 暂无 + <% end %> + + 项目得分:  + ;"> + <%= homework.project.nil? ? "N/A" : project_scores(homework.project) %> + + +
+ 提交文件:  + <% if is_evaluation || is_teacher%> + <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> + <% else %> + 未开启互评功能作业不允许下载 + <% end %> + + + 互评得分:  + <%# student_homework_score = student_score_for_homework(homework) %> + ;"> + <% score = homework.s_score.nil? ? "N/A" : format("%.2f",homework.s_score) %> + <%= score %> +    + <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%> + <%= link_to "学生互评>>",homework_attach_path(homework) %> + <% end %> + +
+ <% if is_evaluation || is_teacher%> + <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> + <% end %> + + 终评得分:  + <%# totle_homework_score = score_for_homework(homework) %> + <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * (@bid.proportion * 1.0 / 100) + (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - @bid.proportion * 1.0 / 100)) %> + ;"> + <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score %> + <%= score %> +    + <% if is_teacher %> + <%= link_to "教师评分>>",homework_attach_path(homework) %> + <% end %> + +
+
+
<% end %> \ No newline at end of file diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb index 87d31b465..7395c9845 100644 --- a/app/views/courses/_course_form.html.erb +++ b/app/views/courses/_course_form.html.erb @@ -1,122 +1,122 @@ - -<% object = [] %> -<% object << 'course' %> -<%= error_messages_for object %> -<% unless @course.new_record? %> -

<%= render :partial => "avatar/avatar_form", :locals => {source: @course} %>

-<% end %> -

- - -

- -<%= f.fields_for @course do |m| %> - <% unless @course.nil? %> -

- - - - -
- <%= l(:label_class_period) %> - *   - <%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时", :maxlength => 5 %> -  <%= l(:label_class_hour) %> -
-

- <% else %> -

- - - - -
- <%= l(:label_class_period) %> - *   - <%= text_field_tag :class_period, nil, :placeholder => "在此输入课时", :maxlength => 5 %><%= l(:label_class_hour) %> -
-

- <% end %> -

- - - - -
- <% if @course != nil %> - - - - - - -
- <%= l(:label_term) %> *   - - <%= select_tag :time,options_for_select(course_time_option,@course.time), {} %> - - <%= select_tag :term,options_for_select(course_term_option,@course.term),{} %> -
- <% end %> -
-

-

- - -

- <%= l(:text_command) %> -<% end %> -

- - - - -

-

- - <%= f.check_box :is_public, :style => "margin-left:10px;" %> - <%= l(:label_course_public_info) %> - -

-

<%= f.text_field :course_type, :value => 1 %>

-<%= wikitoolbar_for 'course_description' %> -<% @course.custom_field_values.each do |value| %> -

<%= custom_field_tag_with_label :course, value %>

-<% end %> -<%= call_hook(:view_courses_form, :course => @course, :form => f) %> - - -<% unless @course.extra_frozen? %> - <% content_for :header_tags do %> - <%= javascript_include_tag 'course_identifier' %> - <% end %> -<% end %> - + +<% object = [] %> +<% object << 'course' %> +<%= error_messages_for object %> +<% unless @course.new_record? %> +

<%= render :partial => "avatar/avatar_form", :locals => {source: @course} %>

+<% end %> +

+ + +

+ +<%= f.fields_for @course do |m| %> + <% unless @course.nil? %> +

+ + + + +
+ <%= l(:label_class_period) %> + *   + <%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时", :maxlength => 5 %> +  <%= l(:label_class_hour) %> +
+

+ <% else %> +

+ + + + +
+ <%= l(:label_class_period) %> + *   + <%= text_field_tag :class_period, nil, :placeholder => "在此输入课时", :maxlength => 5 %><%= l(:label_class_hour) %> +
+

+ <% end %> +

+ + + + +
+ <% if @course != nil %> + + + + + + +
+ <%= l(:label_term) %> *   + + <%= select_tag :time,options_for_select(course_time_option,@course.time), {} %> + + <%= select_tag :term,options_for_select(course_term_option,@course.term),{} %> +
+ <% end %> +
+

+

+ + +

+ <%= l(:text_command) %> +<% end %> +

+ + + + +

+

+ + <%= f.check_box :is_public, :style => "margin-left:10px;" %> + <%= l(:label_course_public_info) %> + +

+

<%= f.text_field :course_type, :value => 1 %>

+<%= wikitoolbar_for 'course_description' %> +<% @course.custom_field_values.each do |value| %> +

<%= custom_field_tag_with_label :course, value %>

+<% end %> +<%= call_hook(:view_courses_form, :course => @course, :form => f) %> + + +<% unless @course.extra_frozen? %> + <% content_for :header_tags do %> + <%= javascript_include_tag 'course_identifier' %> + <% end %> +<% end %> + diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index a62a9c613..1d8b059c7 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -1,105 +1,105 @@ -<%= error_messages_for 'member' %> -<% - roles = Role.givable.all - roles = roles[3..5] - members = @course.member_principals.includes(:roles, :principal).all.sort -%> - -
- <% if members.any? %> - - - - - - - <%= call_hook(:view_projects_settings_members_table_header, :course => @course) %> - - - - <% members.each do |member| %> - <% next if member.new_record? %> - - - - - <% if member.roles.first.to_s == "Manager" %> - - <% else %> - - <% end %> - - <%= call_hook(:view_projects_settings_members_table_header, {:course => @course, :member => member}) %> - - <% end; reset_cycle %> - -
<%= l(:label_user) %><%= l(:label_role_plural) %>
- <%= link_to_user member.principal %> - - - <%= 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 %> -

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

- <%= 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 %> - 		- <%= link_to_function l(:button_edit), - "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;", - :class => 'icon icon-edit' %> - <%= delete_link membership_path(member), - :remote => true, - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> -
- <% else %> -

<%= l(:label_no_data) %>

- <% end %> -
- -
- <% if roles.any? %> - <%= 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 %> -

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

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

-

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

-
- <% end %> - <% end %> -
+<%= error_messages_for 'member' %> +<% + roles = Role.givable.all + roles = roles[3..5] + members = @course.member_principals.includes(:roles, :principal).all.sort +%> + +
+ <% if members.any? %> + + + + + + + <%= call_hook(:view_projects_settings_members_table_header, :course => @course) %> + + + + <% members.each do |member| %> + <% next if member.new_record? %> + + + + + <% if member.roles.first.to_s == "Manager" %> + + <% else %> + + <% end %> + + <%= call_hook(:view_projects_settings_members_table_header, {:course => @course, :member => member}) %> + + <% end; reset_cycle %> + +
<%= l(:label_user) %><%= l(:label_role_plural) %>
+ <%= link_to_user member.principal %> + + + <%= 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 %> +

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

+ <%= 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 %> + 		+ <%= link_to_function l(:button_edit), + "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;", + :class => 'icon icon-edit' %> + <%= delete_link membership_path(member), + :remote => true, + :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> +
+ <% else %> +

<%= l(:label_no_data) %>

+ <% end %> +
+ +
+ <% if roles.any? %> + <%= 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 %> +

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

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

+

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

+
+ <% end %> + <% end %> +
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb index a2b928e15..1674cc43d 100644 --- a/app/views/layouts/_join_exit_project.html.erb +++ b/app/views/layouts/_join_exit_project.html.erb @@ -1,22 +1,22 @@ -
- - <% if ( !(User.current.member_of? @project) && User.current.login?) %> - <%= watcher_link(@project, User.current) %> - <% end %> -
- -
- <% if ( !(User.current.member_of? @project) && User.current.login?) %> - - <%= applied_link(@project, User.current) %> - <% end %> -
- - -
- <% if ((User.current.member_of? @project) && - User.current.login? && - Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s != "Manager") %> - <%= exit_project_link(@project) %> - <% end %> +
+ + <% if ( !(User.current.member_of? @project) && User.current.login?) %> + <%= watcher_link(@project, User.current) %> + <% end %> +
+ +
+ <% if ( !(User.current.member_of? @project) && User.current.login?) %> + + <%= applied_link(@project, User.current) %> + <% end %> +
+ + +
+ <% if ((User.current.member_of? @project) && + User.current.login? && + 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 diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb index 0e55b0c39..9ed134f1e 100644 --- a/app/views/roles/_form.html.erb +++ b/app/views/roles/_form.html.erb @@ -1,69 +1,69 @@ -<%= error_messages_for 'role' %> - -<% unless @role.anonymous? %> -
-<% unless @role.builtin? %> -

<%= f.text_field :name, :required => true %>

-

<%= f.check_box :assignable %>

-<% end %> -

<%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %>

-<% if @role.new_record? && @roles.any? %> -

-<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name, params[:copy_workflow_from] || @copy_from.try(:id))) %>

-<% end %> -
-<% end %> - -

<%= l(:label_permissions) %>

-
-<% perms_by_module = @role.setable_permissions.group_by {|p| p.project_module.to_s} %> -<% perms_by_module.keys.sort.each do |mod| %> - <% if mod.blank? %> -
- <%= l(:label_project) %> - <% perms_by_module[mod].each do |permission| %> - <% if permission.belong_to_project? %> - - <% end %> - <% end %> -
-
- <%= l(:label_course) %> - <% perms_by_module[mod].each do |permission| %> - <% if permission.belong_to_course? %> - - <% end %> - <% end %> -
-
- <%= l(:label_contest) %> - <% perms_by_module[mod].each do |permission| %> - <% if permission.belong_to_contest? %> - - <% end %> - <% end %> -
- <% else %> -
- <%= l_or_humanize(mod, :prefix => 'project_module_') %> - <% perms_by_module[mod].each do |permission| %> - - <% end %> -
- <% end %> - <% end %> -
<%= check_all_links 'permissions' %> -<%= hidden_field_tag 'role[permissions][]', '' %> -
+<%= error_messages_for 'role' %> + +<% unless @role.anonymous? %> +
+<% unless @role.builtin? %> +

<%= f.text_field :name, :required => true %>

+

<%= f.check_box :assignable %>

+<% end %> +

<%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %>

+<% if @role.new_record? && @roles.any? %> +

+<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name, params[:copy_workflow_from] || @copy_from.try(:id))) %>

+<% end %> +
+<% end %> + +

<%= l(:label_permissions) %>

+
+<% perms_by_module = @role.setable_permissions.group_by {|p| p.project_module.to_s} %> +<% perms_by_module.keys.sort.each do |mod| %> + <% if mod.blank? %> +
+ <%= l(:label_project) %> + <% perms_by_module[mod].each do |permission| %> + <% if permission.belong_to_project? %> + + <% end %> + <% end %> +
+
+ <%= l(:label_course) %> + <% perms_by_module[mod].each do |permission| %> + <% if permission.belong_to_course? %> + + <% end %> + <% end %> +
+
+ <%= l(:label_contest) %> + <% perms_by_module[mod].each do |permission| %> + <% if permission.belong_to_contest? %> + + <% end %> + <% end %> +
+ <% else %> +
+ <%= l_or_humanize(mod, :prefix => 'project_module_') %> + <% perms_by_module[mod].each do |permission| %> + + <% end %> +
+ <% end %> + <% end %> +
<%= check_all_links 'permissions' %> +<%= hidden_field_tag 'role[permissions][]', '' %> +
diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb index 2d59c86eb..20955c81e 100644 --- a/app/views/roles/permissions.html.erb +++ b/app/views/roles/permissions.html.erb @@ -1,149 +1,149 @@ -

<%= link_to l(:label_role_plural), roles_path %> » <%=l(:label_permissions_report)%>

- -<%= form_tag(permissions_roles_path, :id => 'permissions_form') do %> -<%= hidden_field_tag 'permissions[0]', '', :id => nil %> -
- - - - - <% @roles.each do |role| %> - - <% end %> - - - -<% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %> -<% perms_by_module.keys.sort.each do |mod| %> - <% if mod.blank? %> - <% perms_by_module[mod].select{ |p| !(p.belong_to_project?) && !(p.belong_to_course?) && !(p.belong_to_contest?) }.each do |permission| %> - - - <% @roles.each do |role| %> - - <% end %> - - <% end %> - - - - <% @roles.each do |role| %> - - <% end %> - - <% perms_by_module[mod].select{ |p| p.belong_to_project? }.each do |permission| %> - - - <% @roles.each do |role| %> - - <% end %> - - <% end %> - - - <% @roles.each do |role| %> - - <% end %> - - <% perms_by_module[mod].select{ |p| p.belong_to_course? }.each do |permission| %> - - - <% @roles.each do |role| %> - - <% end %> - - <% end %> - - - <% @roles.each do |role| %> - - <% end %> - - <% perms_by_module[mod].select{ |p| p.belong_to_contest? }.each do |permission| %> - - - <% @roles.each do |role| %> - - <% end %> - - <% end %> - <% else %> - - - <% @roles.each do |role| %> - - <% end %> - - <% perms_by_module[mod].each do |permission| %> - - - <% @roles.each do |role| %> - - <% end %> - - <% end %> - <% end %> - -<% end %> - -
<%=l(:label_permissions)%> - <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %> - <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> -
- <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - <%= l_or_humanize(permission.name, :prefix => 'permission_') %> - - <% if role.setable_permissions.include? permission %> - <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> - <% end %> -
-   - <%= l(:label_project) %> - <%= h(role.name) %>
- <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - <%= l_or_humanize(permission.name, :prefix => 'permission_') %> - - <% if role.setable_permissions.include? permission %> - <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> - <% end %> -
-   - <%= l(:label_course) %> - <%= h(role.name) %>
- <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - <%= l_or_humanize(permission.name, :prefix => 'permission_') %> - - <% if role.setable_permissions.include? permission %> - <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> - <% end %> -
-   - <%= l(:label_contest) %> - <%= h(role.name) %>
- <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - <%= l_or_humanize(permission.name, :prefix => 'permission_') %> - - <% if role.setable_permissions.include? permission %> - <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> - <% end %> -
-   - <%= l_or_humanize(mod, :prefix => 'project_module_') %> - <%= h(role.name) %>
- <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> - <%= l_or_humanize(permission.name, :prefix => 'permission_') %> - - <% if role.setable_permissions.include? permission %> - <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> - <% end %> -
-
-

<%= check_all_links 'permissions_form' %>

-

<%= submit_tag l(:button_save) %>

-<% end %> +

<%= link_to l(:label_role_plural), roles_path %> » <%=l(:label_permissions_report)%>

+ +<%= form_tag(permissions_roles_path, :id => 'permissions_form') do %> +<%= hidden_field_tag 'permissions[0]', '', :id => nil %> +
+ + + + + <% @roles.each do |role| %> + + <% end %> + + + +<% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %> +<% perms_by_module.keys.sort.each do |mod| %> + <% if mod.blank? %> + <% perms_by_module[mod].select{ |p| !(p.belong_to_project?) && !(p.belong_to_course?) && !(p.belong_to_contest?) }.each do |permission| %> + + + <% @roles.each do |role| %> + + <% end %> + + <% end %> + + + + <% @roles.each do |role| %> + + <% end %> + + <% perms_by_module[mod].select{ |p| p.belong_to_project? }.each do |permission| %> + + + <% @roles.each do |role| %> + + <% end %> + + <% end %> + + + <% @roles.each do |role| %> + + <% end %> + + <% perms_by_module[mod].select{ |p| p.belong_to_course? }.each do |permission| %> + + + <% @roles.each do |role| %> + + <% end %> + + <% end %> + + + <% @roles.each do |role| %> + + <% end %> + + <% perms_by_module[mod].select{ |p| p.belong_to_contest? }.each do |permission| %> + + + <% @roles.each do |role| %> + + <% end %> + + <% end %> + <% else %> + + + <% @roles.each do |role| %> + + <% end %> + + <% perms_by_module[mod].each do |permission| %> + + + <% @roles.each do |role| %> + + <% end %> + + <% end %> + <% end %> + +<% end %> + +
<%=l(:label_permissions)%> + <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %> + <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> +
+ <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%= l_or_humanize(permission.name, :prefix => 'permission_') %> + + <% if role.setable_permissions.include? permission %> + <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> + <% end %> +
+   + <%= l(:label_project) %> + <%= h(role.name) %>
+ <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%= l_or_humanize(permission.name, :prefix => 'permission_') %> + + <% if role.setable_permissions.include? permission %> + <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> + <% end %> +
+   + <%= l(:label_course) %> + <%= h(role.name) %>
+ <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%= l_or_humanize(permission.name, :prefix => 'permission_') %> + + <% if role.setable_permissions.include? permission %> + <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> + <% end %> +
+   + <%= l(:label_contest) %> + <%= h(role.name) %>
+ <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%= l_or_humanize(permission.name, :prefix => 'permission_') %> + + <% if role.setable_permissions.include? permission %> + <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> + <% end %> +
+   + <%= l_or_humanize(mod, :prefix => 'project_module_') %> + <%= h(role.name) %>
+ <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%= l_or_humanize(permission.name, :prefix => 'permission_') %> + + <% if role.setable_permissions.include? permission %> + <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> + <% end %> +
+
+

<%= check_all_links 'permissions_form' %>

+

<%= submit_tag l(:button_save) %>

+<% end %> diff --git a/lib/redmine.rb b/lib/redmine.rb index c96464abc..8eb7756e5 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -1,481 +1,481 @@ -# Redmine - project management software -# Copyright (C) 2006-2013 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -require 'redmine/core_ext' - -begin - require 'RMagick' unless Object.const_defined?(:Magick) -rescue LoadError - # RMagick is not available -end - -require 'redmine/scm/base' -require 'redmine/access_control' -require 'redmine/access_keys' -require 'redmine/activity' -require 'redmine/activity/fetcher' -require 'redmine/ciphering' -require 'redmine/codeset_util' -require 'redmine/custom_field_format' -require 'redmine/i18n' -require 'redmine/menu_manager' -require 'redmine/notifiable' -require 'redmine/platform' -require 'redmine/mime_type' -require 'redmine/notifiable' -require 'redmine/search' -require 'redmine/syntax_highlighting' -require 'redmine/thumbnail' -require 'redmine/unified_diff' -require 'redmine/utils' -require 'redmine/version' -require 'redmine/wiki_formatting' - -require 'redmine/default_data/loader' -require 'redmine/helpers/calendar' -require 'redmine/helpers/diff' -require 'redmine/helpers/gantt' -require 'redmine/helpers/time_report' -require 'redmine/views/other_formats_builder' -require 'redmine/views/labelled_form_builder' -require 'redmine/views/builders' - -require 'redmine/themes' -require 'redmine/hook' -require 'redmine/plugin' - -if RUBY_VERSION < '1.9' - require 'fastercsv' -else - require 'csv' - FCSV = CSV -end - -Redmine::Scm::Base.add "Subversion" -Redmine::Scm::Base.add "Darcs" -Redmine::Scm::Base.add "Mercurial" -Redmine::Scm::Base.add "Cvs" -Redmine::Scm::Base.add "Bazaar" -Redmine::Scm::Base.add "Git" -Redmine::Scm::Base.add "Filesystem" - -Redmine::CustomFieldFormat.map do |fields| - fields.register 'string' - fields.register 'text' - fields.register 'int', :label => :label_integer - fields.register 'float' - fields.register 'list' - fields.register 'date' - fields.register 'bool', :label => :label_boolean - fields.register 'user', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list' - fields.register 'version', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list' -end - -# Permissions -Redmine::AccessControl.map do |map| - map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true, :read => true - map.permission :search_project, {:search => :index}, :public => true, :read => true - map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin ,:belong_to_project => true - map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member ,:belong_to_project => true - map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_project => true - map.permission :select_project_modules, {:projects => :modules}, :require => :member ,:belong_to_project => true - map.permission :select_contest_modules, {:contests => :modules}, :require => :member ,:belong_to_contest => true - map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member ,:belong_to_project => true - map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member ,:belong_to_project => true - map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member ,:belong_to_project => true - #错的权限，先注释掉 - #map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true - - map.permission :quote_project, {},:require => :member,:belong_to_contest => true - map.permission :is_manager,{},:require => :member ,:belong_to_project => true - map.permission :as_teacher,{},:require => :member ,:belong_to_course => true - map.permission :as_student,{},:require => :member ,:belong_to_course => true - - #课程权限模块 - map.permission :view_course, {:courses => [:show], :activities => [:index]}, :public => true, :read => true - map.permission :search_course, {:search => :index}, :public => true, :read => true - map.permission :add_course, {:courses => [:new, :create]}, :require => :loggedin ,:belong_to_course => true - map.permission :edit_course, {:courses => [:settings, :edit, :update]}, :require => :member ,:belong_to_course => true - map.permission :close_course, {:courses => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_course => true - map.permission :select_course_modules, {:courses => :modules}, :require => :member ,:belong_to_course => true - map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true ,:belong_to_course => true - map.permission :memos_attachments_download,{:attachments => :download} - map.permission :projects_attachments_download,{:attachments => :download},:belong_to_project => true - map.permission :course_attachments_download,{:attachments => :download},:belong_to_course => true - map.permission :contest_attachments_download,{:attachments => :download},:belong_to_contest => true - #与项目一致，注释掉 - #map.course_module :files do |map| - # map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin - # map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true - #end - #新闻权限与项目一致注释掉此处 - # map.course_module :news do |map| - # map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member - # map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true - # map.permission :comment_news, {:comments => :create} - # end - - map.course_module :bids do |map| - map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true,:belong_to_course => true - map.permission :paret_in_homework,{},:require => :member ,:belong_to_course => true - end - - #讨论区权限与项目统一，注释掉此课程讨论区权限 - #map.course_module :boards do |map| - # map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member - # map.permission :view_course_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true - # map.permission :add_messages, {:messages => [:new, :reply, :quote]} - # map.permission :edit_messages, {:messages => :edit}, :require => :member - # map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin - # map.permission :delete_messages, {:messages => :destroy}, :require => :member - # map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin - #end - - #end - - map.project_module :issue_tracking do |map| - # Issue categories - map.permission :manage_categories, {:projects => :settings, :issue_categories => [:index, :show, :new, :create, :edit, :update, :destroy]}, :require => :member - # Issues - map.permission :view_issues, {:issues => [:index, :show], - :auto_complete => [:issues], - :context_menus => [:issues], - :versions => [:index, :show, :status_by], - :journals => [:index, :diff], - :queries => :index, - :reports => [:issue_report, :issue_report_details]}, - :read => true - map.permission :add_issues, {:issues => [:new, :create, :update_form], :attachments => :upload} - map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new], :attachments => :upload} - map.permission :manage_issue_relations, {:issue_relations => [:index, :show, :create, :destroy]} - map.permission :manage_subtasks, {} - map.permission :set_issues_private, {} - map.permission :set_own_issues_private, {}, :require => :loggedin - map.permission :add_issue_notes, {:issues => [:edit, :update, :update_form], :journals => [:new], :attachments => :upload} - map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin - map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin - map.permission :view_private_notes, {}, :read => true, :require => :member - map.permission :set_notes_private, {}, :require => :member - map.permission :move_issues, {:issues => [:bulk_edit, :bulk_update]}, :require => :loggedin - map.permission :delete_issues, {:issues => :destroy}, :require => :member - # Queries - map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member - map.permission :save_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin - # Watchers - map.permission :view_issue_watchers, {}, :read => true - map.permission :add_issue_watchers, {:watchers => [:new, :create, :append, :autocomplete_for_user]} - map.permission :delete_issue_watchers, {:watchers => :destroy} - end - - map.project_module :time_tracking do |map| - map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin - map.permission :view_time_entries, {:timelog => [:index, :report, :show]}, :read => true - map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member - map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin - map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member - end - - map.project_module :news do |map| - map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member - map.permission :view_news, {:news => [:index, :show]}, :public => true, :read => true - map.permission :comment_news, {:comments => :create} - end - - map.contest_module :contestnotifications do |map| - map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :notificationcomments => [:destroy]}, :require => :member,:belong_to_contest => true - map.permission :view_contestnotifications, {:contestnotifications => [:index, :show]}, :public => true, :read => true - map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create},:belong_to_contest => true - end - - map.project_module :documents do |map| - map.permission :add_documents, {:documents => [:new, :create, :add_attachment]}, :require => :loggedin - map.permission :edit_documents, {:documents => [:edit, :update, :add_attachment]}, :require => :loggedin - map.permission :delete_documents, {:documents => [:destroy]}, :require => :loggedin - map.permission :view_documents, {:documents => [:index, :show, :download]}, :read => true - end - - map.project_module :files do |map| - map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin - map.permission :view_files, {:files => :index, :versions => :download}, :read => true - end - - map.project_module :wiki do |map| - map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member - map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member - map.permission :delete_wiki_pages, {:wiki => [:destroy, :destroy_version]}, :require => :member - map.permission :view_wiki_pages, {:wiki => [:index, :show, :special, :date_index]}, :read => true - map.permission :export_wiki_pages, {:wiki => [:export]}, :read => true - map.permission :view_wiki_edits, {:wiki => [:history, :diff, :annotate]}, :read => true - map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment] - map.permission :delete_wiki_pages_attachments, {} - map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member - end - - map.project_module :repository do |map| - map.permission :manage_repository, {:repositories => [:new, :create, :edit, :update, :committers, :destroy]}, :require => :member - map.permission :browse_repository, {:repositories => [:show, :browse, :entry, :raw, :annotate, :changes, :diff, :stats, :graph]}, :read => true - map.permission :view_changesets, {:repositories => [:show, :revisions, :revision]}, :read => true - map.permission :commit_access, {} - map.permission :manage_related_issues, {:repositories => [:add_related_issue, :remove_related_issue]} - end - - map.project_module :boards do |map| - map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member - map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true - map.permission :add_messages, {:messages => [:new, :reply, :quote]} - map.permission :edit_messages, {:messages => :edit}, :require => :member - map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin - map.permission :delete_messages, {:messages => :destroy}, :require => :member - map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin - end - - map.project_module :calendar do |map| - map.permission :view_calendar, {:calendars => [:show, :update]}, :read => true - end - - map.project_module :gantt do |map| - map.permission :view_gantt, {:gantts => [:show, :update]}, :read => true - end - - map.project_module :dts do |map| - map.permission :do_dts, {:dts => :show}, :read => true - end - # map.project_module :journals do |map| - # map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true - # end - -end -#by young -Redmine::MenuManager.map :top_menu do |menu| - menu.push :home, {:host => Setting.user_domain} - menu.push :course_practice, {:controller => 'projects', :action => 'course', :project_type => 1} - menu.push :project_deposit, { :controller => 'projects', :action => 'index', :project_type => 0}, :caption => :label_project_deposit - menu.push :software_user, {:controller => 'users', :action => 'index'} - menu.push :contest_innovate, {:controller => 'bids', :action => 'contest', :project_type => 1} - menu.push :requirement_enterprise, {:controller => 'bids', :action => 'index'} - menu.push :project_module_forums, :forums_path - menu.push :stores_index, :stores_path - - - # menu.push :investor, :home_path - # menu.push :theme, :home_path - # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } - # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true - # menu.push :help, Redmine::Info.help_url, :last => true -end -#end - -# by huang -# Redmine::MenuManager.map :top_home_menu do |menu| - # menu.push :home, :home_path - # menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural - # menu.push :developer, {:controller => 'users', :action => 'index'} - # menu.push :investor, :home_path - # menu.push :theme, :home_path - # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } - # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true - # menu.push :help, Redmine::Info.help_url, :last => true -# end - -# Redmine::MenuManager.map :top_enterprise_menu do |menu| - # menu.push :home, :home_path - # menu.push :requirement, {:controller => 'bids', :action => 'index', :project_type => 0 } - # menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural -# - # menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 0 } - # menu.push :college_into, {:controller=>'projects', :action=>'course_enterprise', :project_type => 1 } - # # menu.push :investor, :home_path - # # menu.push :theme, :home_path - # # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } - # # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true - # # menu.push :help, Redmine::Info.help_url, :last => true -# end - -# Redmine::MenuManager.map :top_college_menu do |menu| - # menu.push :home, :home_path - # menu.push :new_course, {:controller => 'projects', :action => 'course', :project_type => 1} - # menu.push :new_homework, {:controller => 'bids', :action => 'index', :project_type => 1 } - # menu.push :new_contest, {:controller => 'bids', :action => 'contest', :project_type => 1} - # menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural - # menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 1 } - # menu.push :enterprise_into, {:controller=>'projects', :action=>'enterprise_course', :project_type => 0 } - # menu.push :investor, :home_path - # menu.push :theme, :home_path - # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } - # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true - # menu.push :help, Redmine::Info.help_url, :last => true -# end -# end - -Redmine::MenuManager.map :account_menu do |menu| - menu.push :login, {:controller => 'account', :action => 'login'}, :if => Proc.new { !User.current.logged? } - menu.push :register, {:controller => 'account', :action => 'register'}, :if => Proc.new { !User.current.logged? && Setting.self_registration? } - # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } - menu.push :logout, {:controller => 'account', :action => 'logout'}, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } -end -########fq -Redmine::MenuManager.map :bid_menu do |menu| - menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_user_response - menu.push :project, { :controller => 'bids', :action => 'show_project', :host => Setting.project_domain }, :caption => :label_bidding_project - # menu.push :result, { :controller => 'bids', :action => 'show_results' }, - # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } -end -###new add by linchun -Redmine::MenuManager.map :contest_menu do |menu| - menu.push :respond, :show_contest_contest_path, :caption => :label_user_response - #menu.push :project, :show_project_contest_path, :caption => :label_contest_project - #menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application - menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest - menu.push :contestnotifications, { :controller => 'contestnotifications', :action => 'index' }, :param => :contest_id, :caption => :label_contest_notification - #menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification - # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest - # menu.push :result, { :controller => 'bids', :action => 'show_results' }, - # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } -end - -#### -Redmine::MenuManager.map :application_menu do |menu| - # Empty -end - -###### -Redmine::MenuManager.map :homework_menu do |menu| - menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_homework_response - menu.push :project, { :controller => 'bids', :action => 'show_project' }, :caption => :label_bidding_homework -end -########end -Redmine::MenuManager.map :admin_menu do |menu| - menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural - menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural - menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made - menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural - menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions - menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural - menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural, - :html => {:class => 'issue_statuses'} - menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow - menu.push :custom_fields, {:controller => 'custom_fields'}, :caption => :label_custom_field_plural, - :html => {:class => 'custom_fields'} - menu.push :enumerations, {:controller => 'enumerations'} - menu.push :settings, {:controller => 'settings'} - menu.push :ldap_authentication, {:controller => 'auth_sources', :action => 'index'}, - :html => {:class => 'server_authentication'} - menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true - menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true - -end -#Modified by young -Redmine::MenuManager.map :project_menu do |menu| - menu.push :overview, { :controller => 'projects', :action => 'show' } -# menu.push :activity, { :controller => 'activities', :action => 'index' } - #menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id -# :if => Proc.new { |p| p.shared_versions.any? } - menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural -# menu.push :new_issue, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new, -# :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) } -# menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt -# menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar - menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural -# menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural -# menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id, -# :if => Proc.new { |p| p.wiki && !p.wiki.new_record? } - menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, - :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural - #menu.push :files, { :controller => 'files', :action => 'index' }, :param => :project_id, :caption => :label_file_new - menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil }, - :if => Proc.new { |p| p.repository && !p.repository.new_record? && !( !User.current.member_of?(p) && p.hidden_repo ) } - menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true - -end -#end - -#added by young -Redmine::MenuManager.map :course_menu do |menu| - menu.push :overview, { :controller => 'projects', :action => 'show'} - menu.push :homework, { :controller => 'projects', :action => 'homework' } -# menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural -# menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id - menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :course => 1 } - # menu.push :settings, { :controller => 'projects', :action => 'settings', :course => 1 }, :last => true - -end -Redmine::MenuManager.map :user_menu do |menu| - menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } - menu.push :user_course, {:controller => 'users', :action => 'user_courses'} - #menu.push :user_homework, {:controller => 'users', :action => 'user_homeworks'} by huang - menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} - # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} by huang - menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} - -end -Redmine::MenuManager.map :user_enterprise_menu do |menu| - menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } - - menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} - - menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} - menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} - -end -Redmine::MenuManager.map :user_menu_self do |menu| - menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.project_domain } - menu.push :user_information, {:controller => 'users', :action => 'info', :host => Setting.user_domain} - menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} - menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} - menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} - -end -#end - -Redmine::Activity.map do |activity| - activity.register :issues, :class_name => %w(Issue Journal) - activity.register :changesets - activity.register :news - activity.register :contestnotification - activity.register :documents, :class_name => %w(Document Attachment) - activity.register :files, :class_name => 'Attachment' - activity.register :course_files, :class_name => 'Attachment' - activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false - activity.register :messages, :default => false - activity.register :time_entries, :default => false - # added by fq - activity.register :bids, :class_name => 'Bid' - activity.register :memos, :class_name => 'Memo' - activity.register :journals_for_messages - # end - #added by nwb - activity.register :course_journals_for_messages , :class_name => 'JournalsForMessage' - activity.register :course_news, :class_name => 'News' - activity.register :course_messages, :default => false, :class_name => 'Message' -end - -Redmine::Search.map do |search| - search.register :issues - search.register :news - search.register :contestnotification - search.register :documents - search.register :changesets - search.register :wiki_pages - search.register :messages - search.register :projects -end - -Redmine::WikiFormatting.map do |format| - format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper -end - -ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler +# Redmine - project management software +# Copyright (C) 2006-2013 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require 'redmine/core_ext' + +begin + require 'RMagick' unless Object.const_defined?(:Magick) +rescue LoadError + # RMagick is not available +end + +require 'redmine/scm/base' +require 'redmine/access_control' +require 'redmine/access_keys' +require 'redmine/activity' +require 'redmine/activity/fetcher' +require 'redmine/ciphering' +require 'redmine/codeset_util' +require 'redmine/custom_field_format' +require 'redmine/i18n' +require 'redmine/menu_manager' +require 'redmine/notifiable' +require 'redmine/platform' +require 'redmine/mime_type' +require 'redmine/notifiable' +require 'redmine/search' +require 'redmine/syntax_highlighting' +require 'redmine/thumbnail' +require 'redmine/unified_diff' +require 'redmine/utils' +require 'redmine/version' +require 'redmine/wiki_formatting' + +require 'redmine/default_data/loader' +require 'redmine/helpers/calendar' +require 'redmine/helpers/diff' +require 'redmine/helpers/gantt' +require 'redmine/helpers/time_report' +require 'redmine/views/other_formats_builder' +require 'redmine/views/labelled_form_builder' +require 'redmine/views/builders' + +require 'redmine/themes' +require 'redmine/hook' +require 'redmine/plugin' + +if RUBY_VERSION < '1.9' + require 'fastercsv' +else + require 'csv' + FCSV = CSV +end + +Redmine::Scm::Base.add "Subversion" +Redmine::Scm::Base.add "Darcs" +Redmine::Scm::Base.add "Mercurial" +Redmine::Scm::Base.add "Cvs" +Redmine::Scm::Base.add "Bazaar" +Redmine::Scm::Base.add "Git" +Redmine::Scm::Base.add "Filesystem" + +Redmine::CustomFieldFormat.map do |fields| + fields.register 'string' + fields.register 'text' + fields.register 'int', :label => :label_integer + fields.register 'float' + fields.register 'list' + fields.register 'date' + fields.register 'bool', :label => :label_boolean + fields.register 'user', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list' + fields.register 'version', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list' +end + +# Permissions +Redmine::AccessControl.map do |map| + map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true, :read => true + map.permission :search_project, {:search => :index}, :public => true, :read => true + map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin ,:belong_to_project => true + map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member ,:belong_to_project => true + map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_project => true + map.permission :select_project_modules, {:projects => :modules}, :require => :member ,:belong_to_project => true + map.permission :select_contest_modules, {:contests => :modules}, :require => :member ,:belong_to_contest => true + map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member ,:belong_to_project => true + map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member ,:belong_to_project => true + map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member ,:belong_to_project => true + #错的权限，先注释掉 + #map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true + + map.permission :quote_project, {},:require => :member,:belong_to_contest => true + map.permission :is_manager,{},:require => :member ,:belong_to_project => true + map.permission :as_teacher,{},:require => :member ,:belong_to_course => true + map.permission :as_student,{},:require => :member ,:belong_to_course => true + + #课程权限模块 + map.permission :view_course, {:courses => [:show], :activities => [:index]}, :public => true, :read => true + map.permission :search_course, {:search => :index}, :public => true, :read => true + map.permission :add_course, {:courses => [:new, :create]}, :require => :loggedin ,:belong_to_course => true + map.permission :edit_course, {:courses => [:settings, :edit, :update]}, :require => :member ,:belong_to_course => true + map.permission :close_course, {:courses => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_course => true + map.permission :select_course_modules, {:courses => :modules}, :require => :member ,:belong_to_course => true + map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true ,:belong_to_course => true + map.permission :memos_attachments_download,{:attachments => :download} + map.permission :projects_attachments_download,{:attachments => :download},:belong_to_project => true + map.permission :course_attachments_download,{:attachments => :download},:belong_to_course => true + map.permission :contest_attachments_download,{:attachments => :download},:belong_to_contest => true + #与项目一致，注释掉 + #map.course_module :files do |map| + # map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin + # map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true + #end + #新闻权限与项目一致注释掉此处 + # map.course_module :news do |map| + # map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member + # map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true + # map.permission :comment_news, {:comments => :create} + # end + + map.course_module :bids do |map| + map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true,:belong_to_course => true + map.permission :paret_in_homework,{},:require => :member ,:belong_to_course => true + end + + #讨论区权限与项目统一，注释掉此课程讨论区权限 + #map.course_module :boards do |map| + # map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member + # map.permission :view_course_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true + # map.permission :add_messages, {:messages => [:new, :reply, :quote]} + # map.permission :edit_messages, {:messages => :edit}, :require => :member + # map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin + # map.permission :delete_messages, {:messages => :destroy}, :require => :member + # map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin + #end + + #end + + map.project_module :issue_tracking do |map| + # Issue categories + map.permission :manage_categories, {:projects => :settings, :issue_categories => [:index, :show, :new, :create, :edit, :update, :destroy]}, :require => :member + # Issues + map.permission :view_issues, {:issues => [:index, :show], + :auto_complete => [:issues], + :context_menus => [:issues], + :versions => [:index, :show, :status_by], + :journals => [:index, :diff], + :queries => :index, + :reports => [:issue_report, :issue_report_details]}, + :read => true + map.permission :add_issues, {:issues => [:new, :create, :update_form], :attachments => :upload} + map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new], :attachments => :upload} + map.permission :manage_issue_relations, {:issue_relations => [:index, :show, :create, :destroy]} + map.permission :manage_subtasks, {} + map.permission :set_issues_private, {} + map.permission :set_own_issues_private, {}, :require => :loggedin + map.permission :add_issue_notes, {:issues => [:edit, :update, :update_form], :journals => [:new], :attachments => :upload} + map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin + map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin + map.permission :view_private_notes, {}, :read => true, :require => :member + map.permission :set_notes_private, {}, :require => :member + map.permission :move_issues, {:issues => [:bulk_edit, :bulk_update]}, :require => :loggedin + map.permission :delete_issues, {:issues => :destroy}, :require => :member + # Queries + map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member + map.permission :save_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin + # Watchers + map.permission :view_issue_watchers, {}, :read => true + map.permission :add_issue_watchers, {:watchers => [:new, :create, :append, :autocomplete_for_user]} + map.permission :delete_issue_watchers, {:watchers => :destroy} + end + + map.project_module :time_tracking do |map| + map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin + map.permission :view_time_entries, {:timelog => [:index, :report, :show]}, :read => true + map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member + map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin + map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member + end + + map.project_module :news do |map| + map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member + map.permission :view_news, {:news => [:index, :show]}, :public => true, :read => true + map.permission :comment_news, {:comments => :create} + end + + map.contest_module :contestnotifications do |map| + map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :notificationcomments => [:destroy]}, :require => :member,:belong_to_contest => true + map.permission :view_contestnotifications, {:contestnotifications => [:index, :show]}, :public => true, :read => true + map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create},:belong_to_contest => true + end + + map.project_module :documents do |map| + map.permission :add_documents, {:documents => [:new, :create, :add_attachment]}, :require => :loggedin + map.permission :edit_documents, {:documents => [:edit, :update, :add_attachment]}, :require => :loggedin + map.permission :delete_documents, {:documents => [:destroy]}, :require => :loggedin + map.permission :view_documents, {:documents => [:index, :show, :download]}, :read => true + end + + map.project_module :files do |map| + map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin + map.permission :view_files, {:files => :index, :versions => :download}, :read => true + end + + map.project_module :wiki do |map| + map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member + map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member + map.permission :delete_wiki_pages, {:wiki => [:destroy, :destroy_version]}, :require => :member + map.permission :view_wiki_pages, {:wiki => [:index, :show, :special, :date_index]}, :read => true + map.permission :export_wiki_pages, {:wiki => [:export]}, :read => true + map.permission :view_wiki_edits, {:wiki => [:history, :diff, :annotate]}, :read => true + map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment] + map.permission :delete_wiki_pages_attachments, {} + map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member + end + + map.project_module :repository do |map| + map.permission :manage_repository, {:repositories => [:new, :create, :edit, :update, :committers, :destroy]}, :require => :member + map.permission :browse_repository, {:repositories => [:show, :browse, :entry, :raw, :annotate, :changes, :diff, :stats, :graph]}, :read => true + map.permission :view_changesets, {:repositories => [:show, :revisions, :revision]}, :read => true + map.permission :commit_access, {} + map.permission :manage_related_issues, {:repositories => [:add_related_issue, :remove_related_issue]} + end + + map.project_module :boards do |map| + map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member + map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true + map.permission :add_messages, {:messages => [:new, :reply, :quote]} + map.permission :edit_messages, {:messages => :edit}, :require => :member + map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin + map.permission :delete_messages, {:messages => :destroy}, :require => :member + map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin + end + + map.project_module :calendar do |map| + map.permission :view_calendar, {:calendars => [:show, :update]}, :read => true + end + + map.project_module :gantt do |map| + map.permission :view_gantt, {:gantts => [:show, :update]}, :read => true + end + + map.project_module :dts do |map| + map.permission :do_dts, {:dts => :show}, :read => true + end + # map.project_module :journals do |map| + # map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true + # end + +end +#by young +Redmine::MenuManager.map :top_menu do |menu| + menu.push :home, {:host => Setting.user_domain} + menu.push :course_practice, {:controller => 'projects', :action => 'course', :project_type => 1} + menu.push :project_deposit, { :controller => 'projects', :action => 'index', :project_type => 0}, :caption => :label_project_deposit + menu.push :software_user, {:controller => 'users', :action => 'index'} + menu.push :contest_innovate, {:controller => 'bids', :action => 'contest', :project_type => 1} + menu.push :requirement_enterprise, {:controller => 'bids', :action => 'index'} + menu.push :project_module_forums, :forums_path + menu.push :stores_index, :stores_path + + + # menu.push :investor, :home_path + # menu.push :theme, :home_path + # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # menu.push :help, Redmine::Info.help_url, :last => true +end +#end + +# by huang +# Redmine::MenuManager.map :top_home_menu do |menu| + # menu.push :home, :home_path + # menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural + # menu.push :developer, {:controller => 'users', :action => 'index'} + # menu.push :investor, :home_path + # menu.push :theme, :home_path + # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # menu.push :help, Redmine::Info.help_url, :last => true +# end + +# Redmine::MenuManager.map :top_enterprise_menu do |menu| + # menu.push :home, :home_path + # menu.push :requirement, {:controller => 'bids', :action => 'index', :project_type => 0 } + # menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural +# + # menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 0 } + # menu.push :college_into, {:controller=>'projects', :action=>'course_enterprise', :project_type => 1 } + # # menu.push :investor, :home_path + # # menu.push :theme, :home_path + # # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # # menu.push :help, Redmine::Info.help_url, :last => true +# end + +# Redmine::MenuManager.map :top_college_menu do |menu| + # menu.push :home, :home_path + # menu.push :new_course, {:controller => 'projects', :action => 'course', :project_type => 1} + # menu.push :new_homework, {:controller => 'bids', :action => 'index', :project_type => 1 } + # menu.push :new_contest, {:controller => 'bids', :action => 'contest', :project_type => 1} + # menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural + # menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 1 } + # menu.push :enterprise_into, {:controller=>'projects', :action=>'enterprise_course', :project_type => 0 } + # menu.push :investor, :home_path + # menu.push :theme, :home_path + # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # menu.push :help, Redmine::Info.help_url, :last => true +# end +# end + +Redmine::MenuManager.map :account_menu do |menu| + menu.push :login, {:controller => 'account', :action => 'login'}, :if => Proc.new { !User.current.logged? } + menu.push :register, {:controller => 'account', :action => 'register'}, :if => Proc.new { !User.current.logged? && Setting.self_registration? } + # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } + menu.push :logout, {:controller => 'account', :action => 'logout'}, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } +end +########fq +Redmine::MenuManager.map :bid_menu do |menu| + menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_user_response + menu.push :project, { :controller => 'bids', :action => 'show_project', :host => Setting.project_domain }, :caption => :label_bidding_project + # menu.push :result, { :controller => 'bids', :action => 'show_results' }, + # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } +end +###new add by linchun +Redmine::MenuManager.map :contest_menu do |menu| + menu.push :respond, :show_contest_contest_path, :caption => :label_user_response + #menu.push :project, :show_project_contest_path, :caption => :label_contest_project + #menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application + menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest + menu.push :contestnotifications, { :controller => 'contestnotifications', :action => 'index' }, :param => :contest_id, :caption => :label_contest_notification + #menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification + # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest + # menu.push :result, { :controller => 'bids', :action => 'show_results' }, + # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } +end + +#### +Redmine::MenuManager.map :application_menu do |menu| + # Empty +end + +###### +Redmine::MenuManager.map :homework_menu do |menu| + menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_homework_response + menu.push :project, { :controller => 'bids', :action => 'show_project' }, :caption => :label_bidding_homework +end +########end +Redmine::MenuManager.map :admin_menu do |menu| + menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural + menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural + menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made + menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural + menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions + menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural + menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural, + :html => {:class => 'issue_statuses'} + menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow + menu.push :custom_fields, {:controller => 'custom_fields'}, :caption => :label_custom_field_plural, + :html => {:class => 'custom_fields'} + menu.push :enumerations, {:controller => 'enumerations'} + menu.push :settings, {:controller => 'settings'} + menu.push :ldap_authentication, {:controller => 'auth_sources', :action => 'index'}, + :html => {:class => 'server_authentication'} + menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true + menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true + +end +#Modified by young +Redmine::MenuManager.map :project_menu do |menu| + menu.push :overview, { :controller => 'projects', :action => 'show' } +# menu.push :activity, { :controller => 'activities', :action => 'index' } + #menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id +# :if => Proc.new { |p| p.shared_versions.any? } + menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural +# menu.push :new_issue, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new, +# :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) } +# menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt +# menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar + menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural +# menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural +# menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id, +# :if => Proc.new { |p| p.wiki && !p.wiki.new_record? } + menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, + :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural + #menu.push :files, { :controller => 'files', :action => 'index' }, :param => :project_id, :caption => :label_file_new + menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil }, + :if => Proc.new { |p| p.repository && !p.repository.new_record? && !( !User.current.member_of?(p) && p.hidden_repo ) } + menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true + +end +#end + +#added by young +Redmine::MenuManager.map :course_menu do |menu| + menu.push :overview, { :controller => 'projects', :action => 'show'} + menu.push :homework, { :controller => 'projects', :action => 'homework' } +# menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural +# menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id + menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :course => 1 } + # menu.push :settings, { :controller => 'projects', :action => 'settings', :course => 1 }, :last => true + +end +Redmine::MenuManager.map :user_menu do |menu| + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } + menu.push :user_course, {:controller => 'users', :action => 'user_courses'} + #menu.push :user_homework, {:controller => 'users', :action => 'user_homeworks'} by huang + menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} + # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} by huang + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} + +end +Redmine::MenuManager.map :user_enterprise_menu do |menu| + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } + + menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} + + menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} + +end +Redmine::MenuManager.map :user_menu_self do |menu| + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.project_domain } + menu.push :user_information, {:controller => 'users', :action => 'info', :host => Setting.user_domain} + menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} + menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} + +end +#end + +Redmine::Activity.map do |activity| + activity.register :issues, :class_name => %w(Issue Journal) + activity.register :changesets + activity.register :news + activity.register :contestnotification + activity.register :documents, :class_name => %w(Document Attachment) + activity.register :files, :class_name => 'Attachment' + activity.register :course_files, :class_name => 'Attachment' + activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false + activity.register :messages, :default => false + activity.register :time_entries, :default => false + # added by fq + activity.register :bids, :class_name => 'Bid' + activity.register :memos, :class_name => 'Memo' + activity.register :journals_for_messages + # end + #added by nwb + activity.register :course_journals_for_messages , :class_name => 'JournalsForMessage' + activity.register :course_news, :class_name => 'News' + activity.register :course_messages, :default => false, :class_name => 'Message' +end + +Redmine::Search.map do |search| + search.register :issues + search.register :news + search.register :contestnotification + search.register :documents + search.register :changesets + search.register :wiki_pages + search.register :messages + search.register :projects +end + +Redmine::WikiFormatting.map do |format| + format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper +end + +ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb index efcaca627..70f227309 100644 --- a/lib/redmine/access_control.rb +++ b/lib/redmine/access_control.rb @@ -1,172 +1,172 @@ -# Redmine - project management software -# Copyright (C) 2006-2013 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -module Redmine - module AccessControl - - class << self - def map - mapper = Mapper.new - yield mapper - @permissions ||= [] - @permissions += mapper.mapped_permissions - end - - def permissions - @permissions - end - - # Returns the permission of given name or nil if it wasn't found - # Argument should be a symbol - def permission(name) - permissions.detect {|p| p.name == name} - end - - # Returns the actions that are allowed by the permission of given name - def allowed_actions(permission_name) - perm = permission(permission_name) - perm ? perm.actions : [] - end - - def public_permissions - @public_permissions ||= @permissions.select {|p| p.public?} - end - - def members_only_permissions - @members_only_permissions ||= @permissions.select {|p| p.require_member?} - end - - def loggedin_only_permissions - @loggedin_only_permissions ||= @permissions.select {|p| p.require_loggedin?} - end - - def read_action?(action) - if action.is_a?(Symbol) - perm = permission(action) - !perm.nil? && perm.read? - else - s = "#{action[:controller]}/#{action[:action]}" - permissions.detect {|p| p.actions.include?(s) && !p.read?}.nil? - end - end - - def available_project_modules - @available_project_modules ||= @permissions.collect(&:project_module).uniq.compact - end - - def available_contest_modules - @available_contest_modules ||= @permissions.collect(&:contest_module).uniq.compact - end - - def modules_permissions(modules) - @permissions.select {|p| p.project_module.nil? || modules.include?(p.project_module.to_s)} - @permissions.select {|p| p.contest_module.nil? || modules.include?(p.contest_module.to_s)} - end - end - - class Mapper - def initialize - @project_module = nil - @course_module = nil - @contest_module = nil - end - - def permission(name, hash, options={}) - @permissions ||= [] - options.merge!(:project_module => @project_module) - options.merge!(:contest_module => @contest_module) - @permissions << Permission.new(name, hash, options) - end - - def project_module(name, options={}) - @project_module = name - yield self - @project_module = nil - end - - def course_module(name, options={}) - @course_module = name - yield self - @course_module = nil - end - def contest_module(name, options={}) - @contest_module = name - yield self - @contest_module = nil - end - - def mapped_permissions - @permissions - end - end - - class Permission - attr_reader :name, :actions, :project_module ,:course_module, :contest_module - - def initialize(name, hash, options) - @name = name - @actions = [] - @public = options[:public] || false - @require = options[:require] - @read = options[:read] || false - @course_module = options[:course_module] - @project_module = options[:project_module] - @contest_module = options[:contest_module] - @belong_to_project = options[:belong_to_project] || false - @belong_to_course = options[:belong_to_course] || false - @belong_to_contest =options[:belong_to_contest] || false - hash.each do |controller, actions| - if actions.is_a? Array - @actions << actions.collect {|action| "#{controller}/#{action}"} - else - @actions << "#{controller}/#{actions}" - end - end - @actions.flatten! - end - - def public? - @public - end - - def require_member? - @require && @require == :member - end - - def require_loggedin? - @require && (@require == :member || @require == :loggedin) - end - - def read? - @read - end - - def belong_to_project? - @belong_to_project - end - - def belong_to_course? - @belong_to_course - end - - def belong_to_contest? - @belong_to_contest - end - - end - end -end +# Redmine - project management software +# Copyright (C) 2006-2013 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +module Redmine + module AccessControl + + class << self + def map + mapper = Mapper.new + yield mapper + @permissions ||= [] + @permissions += mapper.mapped_permissions + end + + def permissions + @permissions + end + + # Returns the permission of given name or nil if it wasn't found + # Argument should be a symbol + def permission(name) + permissions.detect {|p| p.name == name} + end + + # Returns the actions that are allowed by the permission of given name + def allowed_actions(permission_name) + perm = permission(permission_name) + perm ? perm.actions : [] + end + + def public_permissions + @public_permissions ||= @permissions.select {|p| p.public?} + end + + def members_only_permissions + @members_only_permissions ||= @permissions.select {|p| p.require_member?} + end + + def loggedin_only_permissions + @loggedin_only_permissions ||= @permissions.select {|p| p.require_loggedin?} + end + + def read_action?(action) + if action.is_a?(Symbol) + perm = permission(action) + !perm.nil? && perm.read? + else + s = "#{action[:controller]}/#{action[:action]}" + permissions.detect {|p| p.actions.include?(s) && !p.read?}.nil? + end + end + + def available_project_modules + @available_project_modules ||= @permissions.collect(&:project_module).uniq.compact + end + + def available_contest_modules + @available_contest_modules ||= @permissions.collect(&:contest_module).uniq.compact + end + + def modules_permissions(modules) + @permissions.select {|p| p.project_module.nil? || modules.include?(p.project_module.to_s)} + @permissions.select {|p| p.contest_module.nil? || modules.include?(p.contest_module.to_s)} + end + end + + class Mapper + def initialize + @project_module = nil + @course_module = nil + @contest_module = nil + end + + def permission(name, hash, options={}) + @permissions ||= [] + options.merge!(:project_module => @project_module) + options.merge!(:contest_module => @contest_module) + @permissions << Permission.new(name, hash, options) + end + + def project_module(name, options={}) + @project_module = name + yield self + @project_module = nil + end + + def course_module(name, options={}) + @course_module = name + yield self + @course_module = nil + end + def contest_module(name, options={}) + @contest_module = name + yield self + @contest_module = nil + end + + def mapped_permissions + @permissions + end + end + + class Permission + attr_reader :name, :actions, :project_module ,:course_module, :contest_module + + def initialize(name, hash, options) + @name = name + @actions = [] + @public = options[:public] || false + @require = options[:require] + @read = options[:read] || false + @course_module = options[:course_module] + @project_module = options[:project_module] + @contest_module = options[:contest_module] + @belong_to_project = options[:belong_to_project] || false + @belong_to_course = options[:belong_to_course] || false + @belong_to_contest =options[:belong_to_contest] || false + hash.each do |controller, actions| + if actions.is_a? Array + @actions << actions.collect {|action| "#{controller}/#{action}"} + else + @actions << "#{controller}/#{actions}" + end + end + @actions.flatten! + end + + def public? + @public + end + + def require_member? + @require && @require == :member + end + + def require_loggedin? + @require && (@require == :member || @require == :loggedin) + end + + def read? + @read + end + + def belong_to_project? + @belong_to_project + end + + def belong_to_course? + @belong_to_course + end + + def belong_to_contest? + @belong_to_contest + end + + end + end +end From c2b8c309490c451c174b95c6c0cb628cfd296904 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Sep 2014 10:31:47 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E8=BF=98=E5=8E=9Fredmine.rb=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/redmine.rb | 481 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 481 insertions(+) create mode 100644 lib/redmine.rb diff --git a/lib/redmine.rb b/lib/redmine.rb new file mode 100644 index 000000000..8eb7756e5 --- /dev/null +++ b/lib/redmine.rb @@ -0,0 +1,481 @@ +# Redmine - project management software +# Copyright (C) 2006-2013 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require 'redmine/core_ext' + +begin + require 'RMagick' unless Object.const_defined?(:Magick) +rescue LoadError + # RMagick is not available +end + +require 'redmine/scm/base' +require 'redmine/access_control' +require 'redmine/access_keys' +require 'redmine/activity' +require 'redmine/activity/fetcher' +require 'redmine/ciphering' +require 'redmine/codeset_util' +require 'redmine/custom_field_format' +require 'redmine/i18n' +require 'redmine/menu_manager' +require 'redmine/notifiable' +require 'redmine/platform' +require 'redmine/mime_type' +require 'redmine/notifiable' +require 'redmine/search' +require 'redmine/syntax_highlighting' +require 'redmine/thumbnail' +require 'redmine/unified_diff' +require 'redmine/utils' +require 'redmine/version' +require 'redmine/wiki_formatting' + +require 'redmine/default_data/loader' +require 'redmine/helpers/calendar' +require 'redmine/helpers/diff' +require 'redmine/helpers/gantt' +require 'redmine/helpers/time_report' +require 'redmine/views/other_formats_builder' +require 'redmine/views/labelled_form_builder' +require 'redmine/views/builders' + +require 'redmine/themes' +require 'redmine/hook' +require 'redmine/plugin' + +if RUBY_VERSION < '1.9' + require 'fastercsv' +else + require 'csv' + FCSV = CSV +end + +Redmine::Scm::Base.add "Subversion" +Redmine::Scm::Base.add "Darcs" +Redmine::Scm::Base.add "Mercurial" +Redmine::Scm::Base.add "Cvs" +Redmine::Scm::Base.add "Bazaar" +Redmine::Scm::Base.add "Git" +Redmine::Scm::Base.add "Filesystem" + +Redmine::CustomFieldFormat.map do |fields| + fields.register 'string' + fields.register 'text' + fields.register 'int', :label => :label_integer + fields.register 'float' + fields.register 'list' + fields.register 'date' + fields.register 'bool', :label => :label_boolean + fields.register 'user', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list' + fields.register 'version', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list' +end + +# Permissions +Redmine::AccessControl.map do |map| + map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true, :read => true + map.permission :search_project, {:search => :index}, :public => true, :read => true + map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin ,:belong_to_project => true + map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member ,:belong_to_project => true + map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_project => true + map.permission :select_project_modules, {:projects => :modules}, :require => :member ,:belong_to_project => true + map.permission :select_contest_modules, {:contests => :modules}, :require => :member ,:belong_to_contest => true + map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member ,:belong_to_project => true + map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member ,:belong_to_project => true + map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member ,:belong_to_project => true + #错的权限，先注释掉 + #map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true + + map.permission :quote_project, {},:require => :member,:belong_to_contest => true + map.permission :is_manager,{},:require => :member ,:belong_to_project => true + map.permission :as_teacher,{},:require => :member ,:belong_to_course => true + map.permission :as_student,{},:require => :member ,:belong_to_course => true + + #课程权限模块 + map.permission :view_course, {:courses => [:show], :activities => [:index]}, :public => true, :read => true + map.permission :search_course, {:search => :index}, :public => true, :read => true + map.permission :add_course, {:courses => [:new, :create]}, :require => :loggedin ,:belong_to_course => true + map.permission :edit_course, {:courses => [:settings, :edit, :update]}, :require => :member ,:belong_to_course => true + map.permission :close_course, {:courses => [:close, :reopen]}, :require => :member, :read => true ,:belong_to_course => true + map.permission :select_course_modules, {:courses => :modules}, :require => :member ,:belong_to_course => true + map.permission :view_course_journals_for_messages, {:courses => :feedback}, :require => :member,:read => true ,:belong_to_course => true + map.permission :memos_attachments_download,{:attachments => :download} + map.permission :projects_attachments_download,{:attachments => :download},:belong_to_project => true + map.permission :course_attachments_download,{:attachments => :download},:belong_to_course => true + map.permission :contest_attachments_download,{:attachments => :download},:belong_to_contest => true + #与项目一致，注释掉 + #map.course_module :files do |map| + # map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin + # map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true + #end + #新闻权限与项目一致注释掉此处 + # map.course_module :news do |map| + # map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member + # map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true + # map.permission :comment_news, {:comments => :create} + # end + + map.course_module :bids do |map| + map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true,:belong_to_course => true + map.permission :paret_in_homework,{},:require => :member ,:belong_to_course => true + end + + #讨论区权限与项目统一，注释掉此课程讨论区权限 + #map.course_module :boards do |map| + # map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member + # map.permission :view_course_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true + # map.permission :add_messages, {:messages => [:new, :reply, :quote]} + # map.permission :edit_messages, {:messages => :edit}, :require => :member + # map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin + # map.permission :delete_messages, {:messages => :destroy}, :require => :member + # map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin + #end + + #end + + map.project_module :issue_tracking do |map| + # Issue categories + map.permission :manage_categories, {:projects => :settings, :issue_categories => [:index, :show, :new, :create, :edit, :update, :destroy]}, :require => :member + # Issues + map.permission :view_issues, {:issues => [:index, :show], + :auto_complete => [:issues], + :context_menus => [:issues], + :versions => [:index, :show, :status_by], + :journals => [:index, :diff], + :queries => :index, + :reports => [:issue_report, :issue_report_details]}, + :read => true + map.permission :add_issues, {:issues => [:new, :create, :update_form], :attachments => :upload} + map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new], :attachments => :upload} + map.permission :manage_issue_relations, {:issue_relations => [:index, :show, :create, :destroy]} + map.permission :manage_subtasks, {} + map.permission :set_issues_private, {} + map.permission :set_own_issues_private, {}, :require => :loggedin + map.permission :add_issue_notes, {:issues => [:edit, :update, :update_form], :journals => [:new], :attachments => :upload} + map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin + map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin + map.permission :view_private_notes, {}, :read => true, :require => :member + map.permission :set_notes_private, {}, :require => :member + map.permission :move_issues, {:issues => [:bulk_edit, :bulk_update]}, :require => :loggedin + map.permission :delete_issues, {:issues => :destroy}, :require => :member + # Queries + map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member + map.permission :save_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin + # Watchers + map.permission :view_issue_watchers, {}, :read => true + map.permission :add_issue_watchers, {:watchers => [:new, :create, :append, :autocomplete_for_user]} + map.permission :delete_issue_watchers, {:watchers => :destroy} + end + + map.project_module :time_tracking do |map| + map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin + map.permission :view_time_entries, {:timelog => [:index, :report, :show]}, :read => true + map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member + map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin + map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member + end + + map.project_module :news do |map| + map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member + map.permission :view_news, {:news => [:index, :show]}, :public => true, :read => true + map.permission :comment_news, {:comments => :create} + end + + map.contest_module :contestnotifications do |map| + map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :notificationcomments => [:destroy]}, :require => :member,:belong_to_contest => true + map.permission :view_contestnotifications, {:contestnotifications => [:index, :show]}, :public => true, :read => true + map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create},:belong_to_contest => true + end + + map.project_module :documents do |map| + map.permission :add_documents, {:documents => [:new, :create, :add_attachment]}, :require => :loggedin + map.permission :edit_documents, {:documents => [:edit, :update, :add_attachment]}, :require => :loggedin + map.permission :delete_documents, {:documents => [:destroy]}, :require => :loggedin + map.permission :view_documents, {:documents => [:index, :show, :download]}, :read => true + end + + map.project_module :files do |map| + map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin + map.permission :view_files, {:files => :index, :versions => :download}, :read => true + end + + map.project_module :wiki do |map| + map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member + map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member + map.permission :delete_wiki_pages, {:wiki => [:destroy, :destroy_version]}, :require => :member + map.permission :view_wiki_pages, {:wiki => [:index, :show, :special, :date_index]}, :read => true + map.permission :export_wiki_pages, {:wiki => [:export]}, :read => true + map.permission :view_wiki_edits, {:wiki => [:history, :diff, :annotate]}, :read => true + map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment] + map.permission :delete_wiki_pages_attachments, {} + map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member + end + + map.project_module :repository do |map| + map.permission :manage_repository, {:repositories => [:new, :create, :edit, :update, :committers, :destroy]}, :require => :member + map.permission :browse_repository, {:repositories => [:show, :browse, :entry, :raw, :annotate, :changes, :diff, :stats, :graph]}, :read => true + map.permission :view_changesets, {:repositories => [:show, :revisions, :revision]}, :read => true + map.permission :commit_access, {} + map.permission :manage_related_issues, {:repositories => [:add_related_issue, :remove_related_issue]} + end + + map.project_module :boards do |map| + map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member + map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true + map.permission :add_messages, {:messages => [:new, :reply, :quote]} + map.permission :edit_messages, {:messages => :edit}, :require => :member + map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin + map.permission :delete_messages, {:messages => :destroy}, :require => :member + map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin + end + + map.project_module :calendar do |map| + map.permission :view_calendar, {:calendars => [:show, :update]}, :read => true + end + + map.project_module :gantt do |map| + map.permission :view_gantt, {:gantts => [:show, :update]}, :read => true + end + + map.project_module :dts do |map| + map.permission :do_dts, {:dts => :show}, :read => true + end + # map.project_module :journals do |map| + # map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true + # end + +end +#by young +Redmine::MenuManager.map :top_menu do |menu| + menu.push :home, {:host => Setting.user_domain} + menu.push :course_practice, {:controller => 'projects', :action => 'course', :project_type => 1} + menu.push :project_deposit, { :controller => 'projects', :action => 'index', :project_type => 0}, :caption => :label_project_deposit + menu.push :software_user, {:controller => 'users', :action => 'index'} + menu.push :contest_innovate, {:controller => 'bids', :action => 'contest', :project_type => 1} + menu.push :requirement_enterprise, {:controller => 'bids', :action => 'index'} + menu.push :project_module_forums, :forums_path + menu.push :stores_index, :stores_path + + + # menu.push :investor, :home_path + # menu.push :theme, :home_path + # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # menu.push :help, Redmine::Info.help_url, :last => true +end +#end + +# by huang +# Redmine::MenuManager.map :top_home_menu do |menu| + # menu.push :home, :home_path + # menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural + # menu.push :developer, {:controller => 'users', :action => 'index'} + # menu.push :investor, :home_path + # menu.push :theme, :home_path + # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # menu.push :help, Redmine::Info.help_url, :last => true +# end + +# Redmine::MenuManager.map :top_enterprise_menu do |menu| + # menu.push :home, :home_path + # menu.push :requirement, {:controller => 'bids', :action => 'index', :project_type => 0 } + # menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural +# + # menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 0 } + # menu.push :college_into, {:controller=>'projects', :action=>'course_enterprise', :project_type => 1 } + # # menu.push :investor, :home_path + # # menu.push :theme, :home_path + # # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # # menu.push :help, Redmine::Info.help_url, :last => true +# end + +# Redmine::MenuManager.map :top_college_menu do |menu| + # menu.push :home, :home_path + # menu.push :new_course, {:controller => 'projects', :action => 'course', :project_type => 1} + # menu.push :new_homework, {:controller => 'bids', :action => 'index', :project_type => 1 } + # menu.push :new_contest, {:controller => 'bids', :action => 'contest', :project_type => 1} + # menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural + # menu.push :developer, {:controller => 'users', :action => 'index', :project_type => 1 } + # menu.push :enterprise_into, {:controller=>'projects', :action=>'enterprise_course', :project_type => 0 } + # menu.push :investor, :home_path + # menu.push :theme, :home_path + # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # menu.push :help, Redmine::Info.help_url, :last => true +# end +# end + +Redmine::MenuManager.map :account_menu do |menu| + menu.push :login, {:controller => 'account', :action => 'login'}, :if => Proc.new { !User.current.logged? } + menu.push :register, {:controller => 'account', :action => 'register'}, :if => Proc.new { !User.current.logged? && Setting.self_registration? } + # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } + menu.push :logout, {:controller => 'account', :action => 'logout'}, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } +end +########fq +Redmine::MenuManager.map :bid_menu do |menu| + menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_user_response + menu.push :project, { :controller => 'bids', :action => 'show_project', :host => Setting.project_domain }, :caption => :label_bidding_project + # menu.push :result, { :controller => 'bids', :action => 'show_results' }, + # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } +end +###new add by linchun +Redmine::MenuManager.map :contest_menu do |menu| + menu.push :respond, :show_contest_contest_path, :caption => :label_user_response + #menu.push :project, :show_project_contest_path, :caption => :label_contest_project + #menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application + menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest + menu.push :contestnotifications, { :controller => 'contestnotifications', :action => 'index' }, :param => :contest_id, :caption => :label_contest_notification + #menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification + # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest + # menu.push :result, { :controller => 'bids', :action => 'show_results' }, + # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } +end + +#### +Redmine::MenuManager.map :application_menu do |menu| + # Empty +end + +###### +Redmine::MenuManager.map :homework_menu do |menu| + menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_homework_response + menu.push :project, { :controller => 'bids', :action => 'show_project' }, :caption => :label_bidding_homework +end +########end +Redmine::MenuManager.map :admin_menu do |menu| + menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural + menu.push :users, {:controller => 'admin', :action => 'users'}, :caption => :label_user_plural + menu.push :first_page_made, {:controller => 'admin',:action => 'first_page_made'},:caption => :label_first_page_made + menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural + menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions + menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural + menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural, + :html => {:class => 'issue_statuses'} + menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow + menu.push :custom_fields, {:controller => 'custom_fields'}, :caption => :label_custom_field_plural, + :html => {:class => 'custom_fields'} + menu.push :enumerations, {:controller => 'enumerations'} + menu.push :settings, {:controller => 'settings'} + menu.push :ldap_authentication, {:controller => 'auth_sources', :action => 'index'}, + :html => {:class => 'server_authentication'} + menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true + menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true + +end +#Modified by young +Redmine::MenuManager.map :project_menu do |menu| + menu.push :overview, { :controller => 'projects', :action => 'show' } +# menu.push :activity, { :controller => 'activities', :action => 'index' } + #menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id +# :if => Proc.new { |p| p.shared_versions.any? } + menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural +# menu.push :new_issue, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new, +# :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) } +# menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt +# menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar + menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural +# menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural +# menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id, +# :if => Proc.new { |p| p.wiki && !p.wiki.new_record? } + menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, + :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural + #menu.push :files, { :controller => 'files', :action => 'index' }, :param => :project_id, :caption => :label_file_new + menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil }, + :if => Proc.new { |p| p.repository && !p.repository.new_record? && !( !User.current.member_of?(p) && p.hidden_repo ) } + menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true + +end +#end + +#added by young +Redmine::MenuManager.map :course_menu do |menu| + menu.push :overview, { :controller => 'projects', :action => 'show'} + menu.push :homework, { :controller => 'projects', :action => 'homework' } +# menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural +# menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id + menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :course => 1 } + # menu.push :settings, { :controller => 'projects', :action => 'settings', :course => 1 }, :last => true + +end +Redmine::MenuManager.map :user_menu do |menu| + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } + menu.push :user_course, {:controller => 'users', :action => 'user_courses'} + #menu.push :user_homework, {:controller => 'users', :action => 'user_homeworks'} by huang + menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} + # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} by huang + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} + +end +Redmine::MenuManager.map :user_enterprise_menu do |menu| + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain } + + menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} + + menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} + +end +Redmine::MenuManager.map :user_menu_self do |menu| + menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.project_domain } + menu.push :user_information, {:controller => 'users', :action => 'info', :host => Setting.user_domain} + menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain} + menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.user_domain} + menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.user_domain} + +end +#end + +Redmine::Activity.map do |activity| + activity.register :issues, :class_name => %w(Issue Journal) + activity.register :changesets + activity.register :news + activity.register :contestnotification + activity.register :documents, :class_name => %w(Document Attachment) + activity.register :files, :class_name => 'Attachment' + activity.register :course_files, :class_name => 'Attachment' + activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false + activity.register :messages, :default => false + activity.register :time_entries, :default => false + # added by fq + activity.register :bids, :class_name => 'Bid' + activity.register :memos, :class_name => 'Memo' + activity.register :journals_for_messages + # end + #added by nwb + activity.register :course_journals_for_messages , :class_name => 'JournalsForMessage' + activity.register :course_news, :class_name => 'News' + activity.register :course_messages, :default => false, :class_name => 'Message' +end + +Redmine::Search.map do |search| + search.register :issues + search.register :news + search.register :contestnotification + search.register :documents + search.register :changesets + search.register :wiki_pages + search.register :messages + search.register :projects +end + +Redmine::WikiFormatting.map do |format| + format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper +end + +ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler From 0081d898cb21e186342fe1e2c794e8d86167158a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Sep 2014 10:36:45 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_course_show.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 2b834cf0a..43a467154 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -94,11 +94,11 @@

-
+
<% if @project %> - <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %> + <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project),title: @topic.subject.to_s %> <% elsif @course %> - <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %> + <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %> <% end %>
From da853bf4eb7b160a218e7b9eb1f2a214fd4d8ee0 Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 29 Sep 2014 10:43:54 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dredmin.rb=E8=A2=AB?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_show_all_attachment.html.erb | 14 +++++------ lib/redmine.rb | 24 +++++++++---------- public/stylesheets/application.css | 2 ++ 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/views/files/_show_all_attachment.html.erb b/app/views/files/_show_all_attachment.html.erb index 0dbd735c4..c1df86b32 100644 --- a/app/views/files/_show_all_attachment.html.erb +++ b/app/views/files/_show_all_attachment.html.erb @@ -14,14 +14,14 @@ - <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %> + <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure",:class => "tableth") %> <%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %> - <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %> - <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %> - <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %> - <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %> - <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %> - <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %> + <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children",:class => "tableth") %> + <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %> + <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype",:class => "tableth") %> + <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense",:class => "tableth") %> + <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action",:class => "tableth") %> + <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children",:class => "tableth") %> diff --git a/lib/redmine.rb b/lib/redmine.rb index 8eb7756e5..52e81b05b 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -117,33 +117,33 @@ Redmine::AccessControl.map do |map| map.permission :projects_attachments_download,{:attachments => :download},:belong_to_project => true map.permission :course_attachments_download,{:attachments => :download},:belong_to_course => true map.permission :contest_attachments_download,{:attachments => :download},:belong_to_contest => true - #与项目一致，注释掉 - #map.course_module :files do |map| + + map.course_module :files do |map| # map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin - # map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true - #end - #新闻权限与项目一致注释掉此处 - # map.course_module :news do |map| + map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true + end + + map.course_module :news do |map| # map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member - # map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true + map.permission :view_course_news, {:news => [:index, :show]}, :public => true, :read => true # map.permission :comment_news, {:comments => :create} - # end + end map.course_module :bids do |map| map.permission :view_homework_attaches, {:bids => [:show, :show_project, :revision]}, :read => true,:belong_to_course => true map.permission :paret_in_homework,{},:require => :member ,:belong_to_course => true end - #讨论区权限与项目统一，注释掉此课程讨论区权限 - #map.course_module :boards do |map| + + map.course_module :boards do |map| # map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member - # map.permission :view_course_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true + map.permission :view_course_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true, :read => true # map.permission :add_messages, {:messages => [:new, :reply, :quote]} # map.permission :edit_messages, {:messages => :edit}, :require => :member # map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin # map.permission :delete_messages, {:messages => :destroy}, :require => :member # map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin - #end + end #end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d69ed6171..e83037ca4 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2810,3 +2810,5 @@ div.repos_explain{ text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); cursor: pointer; } + +.tableth{background-color:#EEEEEE; padding: 4px; white-space:pre;} From 090ef98ec621ab1aa655d1718e0eb54ac3dea915 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Sep 2014 10:44:33 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=EF=BC=9A=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=BC=B9=E5=87=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=8F=8F=E8=BF=B0=E5=90=ABhtml=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20#1292=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=A7=A3=E6=9E=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_show_forums.html.erb | 2 +- app/views/tags/_tag_search_results.html.erb | 56 ++++++++++----------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/views/tags/_show_forums.html.erb b/app/views/tags/_show_forums.html.erb index c6dd8a2ed..3caba4903 100644 --- a/app/views/tags/_show_forums.html.erb +++ b/app/views/tags/_show_forums.html.erb @@ -6,7 +6,7 @@ <%= l(:label_tags_forum) %>:<%= link_to "#{forum.name}", :controller => "forums",:action => "show",:id => forum.id %>
- <%= l(:label_tags_forum_description) %>:<%= forum.description %> + <%= l(:label_tags_forum_description) %>:<%= textAreailizable forum.description %> <%= forum.updated_at %>

diff --git a/app/views/tags/_tag_search_results.html.erb b/app/views/tags/_tag_search_results.html.erb index 43048be58..3ed4ba112 100644 --- a/app/views/tags/_tag_search_results.html.erb +++ b/app/views/tags/_tag_search_results.html.erb @@ -2,45 +2,45 @@ <% unless show_flag.nil? %> <% case %> <% when show_flag == '1' %> - <%=l(:label_user)%>(<%= @results_count %>) - <%= render :partial => "show_users",:locals => {:users_results => users_results}%> + <%=l(:label_user)%>(<%= @results_count %>) + <%= render :partial => "show_users",:locals => {:users_results => users_results}%> <% when show_flag == '2'%> - <%=l(:label_project)%>(<%= @results_count %>) - <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%> + <%=l(:label_project)%>(<%= @results_count %>) + <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%> <% when show_flag == '3'%> - <%=l(:label_issue)%>(<%= @results_count %>) - <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%> + <%=l(:label_issue)%>(<%= @results_count %>) + <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%> <% when show_flag == '4'%> - <%= l(:label_requirement)%>(<%= @results_count %>) - <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%> + <%= l(:label_requirement)%>(<%= @results_count %>) + <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%> <% when show_flag == '5'%> - <%= l(:label_forum)%>(<%= @results_count %>) - <%= render :partial => "show_forums",:locals => {:forums_results => forums_results}%> + <%= l(:label_forum)%>(<%= @results_count %>) + <%= render :partial => "show_forums",:locals => {:forums_results => forums_results}%> <% when show_flag == '6'%> - <%= l(:label_attachment)%>(<%= @results_count %>) - <%= render :partial => "show_attachments",:locals => {:attachments_results => attachments_results}%> + <%= l(:label_attachment)%>(<%= @results_count %>) + <%= render :partial => "show_attachments",:locals => {:attachments_results => attachments_results}%> <% when show_flag == '7'%> - <%= l(:label_contest_innovate)%>(<%= @results_count %>) - <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%> + <%= l(:label_contest_innovate)%>(<%= @results_count %>) + <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%> <% when show_flag == '8'%> - <%#= l(:label_attachment)%> - 开源项目：(<%= @results_count %>) - <%= render :partial => "show_open_source_projects",:locals => {:projects_results => open_source_projects_results}%> - <% when show_flag == '9'%> - <%= l(:label_course)%>(<%= @results_count %>) - <%= render :partial => "show_courses",:locals => {:courses_results => courses_results}%> + <%#= l(:label_attachment)%> + 开源项目：(<%= @results_count %>) + <%= render :partial => "show_open_source_projects",:locals => {:projects_results => open_source_projects_results}%> + <% when show_flag == '9'%> + <%= l(:label_course)%>(<%= @results_count %>) + <%= render :partial => "show_courses",:locals => {:courses_results => courses_results}%> <% else %> - <%= l(:label_tags_all_objects)%> - - <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%> - <%= render :partial => "show_users",:locals => {:users_results => users_results }%> - <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%> - <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%> - <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%> + <%= l(:label_tags_all_objects)%> + + <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%> + <%= render :partial => "show_users",:locals => {:users_results => users_results }%> + <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%> + <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%> + <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%> <% end %> <% else %> - no data... + no data... <% end %> <%= render :partial => "pagination",:locals => {:obj_pages => @obj_pages} %> From 1b98572bc2d88b49df643df5baf817f3b64459e5 Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 29 Sep 2014 11:01:04 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=99=84=E4=BB=B6=E6=9D=83=E9=99=90=E6=81=A2?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/redmine.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine.rb b/lib/redmine.rb index 52e81b05b..55511c5b5 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -120,7 +120,7 @@ Redmine::AccessControl.map do |map| map.course_module :files do |map| # map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin - map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true + map.permission :view_course_files, {:files => :index, :versions => :download}, :read => true,:belong_to_course => true end map.course_module :news do |map| From 42d0f420a8cc650acd18f41476a516147dee0c28 Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 29 Sep 2014 11:59:44 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=88=A0=E9=99=A4=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=AD=A3=EF=BC=8C=E7=AB=9E=E8=B5=9B=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E9=99=84=E4=BB=B6=E5=88=A0=E9=99=A4=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 079a4e822..215df8e10 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -193,12 +193,14 @@ class AttachmentsController < ApplicationController else format.html { redirect_to_referer_or course_path(@course) } end + elsif !@attachment.container.nil? && @attachment.container.is_a?(Softapplication) + format.html { redirect_to_referer_or softapplications_path(@attachment.container) } else - # if @project.nil? - # format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) } - # else + if @project.nil? + format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) } + else format.html { redirect_to_referer_or project_path(@project) } - # end + end end format.js From eeccb9da828aed815f2079ec54111710a1f54f81 Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 29 Sep 2014 14:29:57 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=8D=E5=8B=BE=E9=80=89=E5=8D=B4=E4=BB=8D?= =?UTF-8?q?=E7=84=B6=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_tools_expand.html.erb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index 13d63fc08..1639fcd30 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -5,21 +5,31 @@

    项目交流

  • <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
    • -
  • <%= link_to l(:project_module_files) ,project_files_path(@project) %>
    • + <% if @project.enabled_modules.where("name = 'files'").count > 0 %> +
  • <%= link_to l(:project_module_files) ,project_files_path(@project) %>
    • + <% end %> <% if @project.enabled_modules.where("name = 'wiki'").count > 0 %>
  • <%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
    • <% end %>

    进度跟踪

    -
  • <%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
    • + <% if @project.enabled_modules.where("name = 'calendar'").count > 0 %> +
  • <%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
    • + <% end %> +
  • <%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %>
    • -
  • <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
    • + <% if @project.enabled_modules.where("name = 'gantt'").count > 0 %> +
  • <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
    • + <% end %> +

    其他工具

    <% if @project.enabled_modules.where(" name = 'dts'").count > 0 %>
  • <%= link_to l(:label_module_share) ,share_show_path(@project) %>
    • <% end %> -
  • <%= link_to l(:project_module_documents), project_documents_path(@project) %>
    • + <% if @project.enabled_modules.where(" name = 'documents'").count > 0 %> +
  • <%= link_to l(:project_module_documents), project_documents_path(@project) %>
    • + <% end %>
From 19955002306e5b175911ec3d27d0420bca17a885 Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 29 Sep 2014 15:00:01 +0800 Subject: [PATCH 12/15] =?UTF-8?q?#1245=E5=B7=AE=E5=88=AB=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B6=85=E8=BE=B9=E6=A1=86=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9css=EF=BC=8C=E5=90=8C=E6=97=B6=E5=B0=86style=E7=A7=BB?= =?UTF-8?q?=E5=88=B0application.css=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/journals/diff.html.erb | 2 +- public/stylesheets/application.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb index 237cfea4f..d846b9d19 100644 --- a/app/views/journals/diff.html.erb +++ b/app/views/journals/diff.html.erb @@ -1,7 +1,7 @@

<%=h @issue.tracker %> #<%= @issue.id %>

<%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %>

-
+
<%= simple_format_without_paragraph @diff.to_html %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e83037ca4..38af97023 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2352,6 +2352,8 @@ button.tabs_new_enterprise-right { background-color:#f6f6f6; color:#505050; border: 1px solid #e4e4e4; + word-break: break-all; + word-wrap: break-word; } /***** Wiki *****/ From b2f7e4d2346c864b71003ce97ebdbd1318554843 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Sep 2014 16:33:12 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E8=80=81=E5=B8=88=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AF=B9=E4=BD=9C=E4=B8=9A=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=AF=84=E4=BB=B7=EF=BC=8C=E6=9C=80=E7=BB=88?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=BB=A5=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=B8=BA=E6=9C=80=E7=BB=88=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_comprehensive_evaluation.html.erb | 32 ++++++++++++++++--- .../homework_attach/_evaluation.html.erb | 2 +- .../_evaluation_add_jour.html.erb | 10 ++++-- app/views/homework_attach/show.html.erb | 1 - 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/app/views/homework_attach/_comprehensive_evaluation.html.erb b/app/views/homework_attach/_comprehensive_evaluation.html.erb index b9ae1b496..59654c52c 100644 --- a/app/views/homework_attach/_comprehensive_evaluation.html.erb +++ b/app/views/homework_attach/_comprehensive_evaluation.html.erb @@ -1,31 +1,55 @@ <% is_teacher = is_course_teacher User.current,homework.bid.courses.first %> <% if comprehensive_evaluation != nil && comprehensive_evaluation.count > 0 %> -
+
作业综评： - <%= render :partial => 'show_score', locals: {:stars => teaher_score} %> + <% if teaher_score != "0.00" %> + <%= render :partial => 'show_score', locals: {:stars => teaher_score} %> + <% end %>
<%= comprehensive_evaluation.first.notes%>
+ <% if is_teacher %> + <%= render :partial => 'evaluation', :locals => {:homework => homework} %> +
+ <%= render :partial => 'evaluation_add_jour', + :locals => {:homework_attach => homework, + :sta => 0, + :is_comprehensive_evaluation => 1, + :comprehensive_evaluation => comprehensive_evaluation.first.notes} %> +
+ <% end %>
<% else %> <% if is_teacher %>
作业综评： + <% if teaher_score != "0.00" %> + <%= render :partial => 'show_score', locals: {:stars => teaher_score} %> + <% end %>
<%= render :partial => 'evaluation', :locals => {:homework => homework} %>
- <%= render :partial => 'evaluation_add_jour', :locals => {:homework_attach => homework, :sta => 0,:is_comprehensive_evaluation => 1} %> + <%= render :partial => 'evaluation_add_jour', + :locals => {:homework_attach => homework, + :sta => 0, + :is_comprehensive_evaluation => 1, + :comprehensive_evaluation => nil} %>
<% else %>
作业综评： + <% if teaher_score != "0.00" %> + <%= render :partial => 'show_score', locals: {:stars => teaher_score} %> + <% end %>
-
老师还未进行评价！
+ <% if teaher_score == "0.00" %> +
老师还未进行评价！
+ <% end %>
<% end %> <% end %> \ No newline at end of file diff --git a/app/views/homework_attach/_evaluation.html.erb b/app/views/homework_attach/_evaluation.html.erb index bd8677fb1..40996c787 100644 --- a/app/views/homework_attach/_evaluation.html.erb +++ b/app/views/homework_attach/_evaluation.html.erb @@ -1,4 +1,4 @@
评分: <%= rating_for homework, dimension: :quality, class: 'rateable div_inline' %> - (每个用户对每份作业只能进行一次评价！) + (您可以对作业进行多次评价，以最后一次评价为最终结果)
\ No newline at end of file diff --git a/app/views/homework_attach/_evaluation_add_jour.html.erb b/app/views/homework_attach/_evaluation_add_jour.html.erb index 5ba198013..5103b50ae 100644 --- a/app/views/homework_attach/_evaluation_add_jour.html.erb +++ b/app/views/homework_attach/_evaluation_add_jour.html.erb @@ -65,10 +65,13 @@ <% if User.current.logged? %> - + :style => "resize: none;", :class => 'noline'%> +
<%= f.text_area 'user_message', :rows => 3, :cols => 65, :value => "#{l(:label_leave_a_message)}", + + <%= f.text_area 'user_message', :rows => 3, :cols => 65, + :value => "#{comprehensive_evaluation.nil? ? l(:label_leave_a_message) : comprehensive_evaluation}", :onfocus => "clearInfo('new_form_user_message','#{l(:label_leave_a_message)}')", :onblur => "showInfo('new_form_user_message','#{l(:label_leave_a_message)}')", - :style => "resize: none;", :class => 'noline'%>
<%= f.text_field :reference_user_id, :style=>"display:none"%> @@ -81,7 +84,8 @@ <%= submit_tag l(:button_clear_meassge), :name => nil, :class => "enterprise", :onclick => "clearMessage('new_form_user_message');", :onmouseout => "this.style.backgroundPosition = 'left top'", - :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> + :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> + <% else %> diff --git a/app/views/homework_attach/show.html.erb b/app/views/homework_attach/show.html.erb index 87dcf60cb..d3fe3f334 100644 --- a/app/views/homework_attach/show.html.erb +++ b/app/views/homework_attach/show.html.erb @@ -9,7 +9,6 @@ <% is_student = is_cur_course_student @homework.bid.courses.first %> <% is_teacher = is_course_teacher User.current,@homework.bid.courses.first %>

<%= notice %>

-
From ca519ce22df7ccf5b5aaf54e7c5b54fba4d4b950 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Sep 2014 16:49:47 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E6=98=BE=E7=A4=BA=E7=9C=9F=E5=AE=9E=E5=A7=93?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- app/views/courses/_member_list.html.erb | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c73a1e0fc..9ae57db3d 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -641,7 +641,7 @@ class CoursesController < ApplicationController def isCourseTeacher(id,course) result = false user = User.find(id) - if user.nil? && user.allowed_to?(:as_teacher,course)#@teachers && @teachers.count != 0 && @teachers.find_by_user_id(id) != nil + if !user.nil? && user.allowed_to?(:as_teacher,course) result = true end result diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index a8a9e8085..edd04bc97 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -13,11 +13,8 @@ <% end %> - <% unless member.user.user_extensions.identity ==0 %> - - <%if @canShowCode%> - <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %> - <% end %> + <%if @canShowCode%> + <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %> <% end %>
 

From 2ce07955c1191f92f2e1f7874de59afbfaad15de Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Sep 2014 16:59:36 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/settings/_members.html.erb | 43 +++++++------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index 1d8b059c7..f685e4543 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -20,34 +20,25 @@ <% 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 => course_memberships_path(member),:method => :put, - :html => {:id => "member-#{member.id}-roles-form", - :class => 'hol'}} + <%= form_for(member, {:as => :membership, :remote => true, :url => membership_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 %> @@ -79,10 +70,8 @@ <%= 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') }')" %>
@@ -92,12 +81,10 @@

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

+ + + <% end %>

+

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

<% end %>