添加课程 查看真名、查看成员、作业导出权限代码(未应用)

This commit is contained in:
z9hang 2014-06-06 10:37:06 +08:00
parent 1c461dc8ef
commit 4478c86cea
5 changed files with 24 additions and 7 deletions

View File

@ -134,7 +134,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
activerecord-jdbc-adapter (= 1.2.5) activerecord-jdbc-adapter (= 1.2.5)
activerecord-jdbcmysql-adapter activerecord-jdbcmysql-adapter
acts-as-taggable-on acts-as-taggable-on (= 2.4.1)
better_errors! better_errors!
builder (= 3.0.0) builder (= 3.0.0)
coderay (~> 1.0.6) coderay (~> 1.0.6)

View File

@ -37,7 +37,7 @@ class ProjectsController < ApplicationController
# before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file,
# :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share, # :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
# :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index] # :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
#此条勿删 课程相关权限 ,:new_homework,:homework,:feedback #此条勿删 课程相关权限 ,:new_homework,:homework,:feedback,,:member
before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course] before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches] before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar] before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
@ -722,6 +722,9 @@ class ProjectsController < ApplicationController
@teachers= searchTeacherAndAssistant(@project) @teachers= searchTeacherAndAssistant(@project)
@canShowRealName = isCourseTeacher(User.current.id) @canShowRealName = isCourseTeacher(User.current.id)
end end
#勿删 real_name action为虚拟的该方法并不存在用来辅助判断真名权限
#勿删 @canShowRealName = User.current.allowed_to?({:controller => "projects", :action => "real_name"}, @project || @projects, :global => false)
respond_to do |format| respond_to do |format|
format.html{render :layout => 'base_courses' if @base_courses_tag==1} format.html{render :layout => 'base_courses' if @base_courses_tag==1}
format.api format.api

View File

@ -1,7 +1,21 @@
class ZipdownController < ApplicationController class ZipdownController < ApplicationController
#查找项目(课程)
before_filter :find_project_by_bid_id, :only => [:assort,:download_user_homework]
#检查权限
#勿删 before_filter :authorize, :only => [:assort,:download_user_homework]
SAVE_FOLDER = "#{Rails.root}/files" SAVE_FOLDER = "#{Rails.root}/files"
OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip" OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip"
#通过作业Id找到项目课程
def find_project_by_bid_id
obj_class = params[:obj_class]
obj_id = params[:obj_id]
obj = obj_class.constantize.find(obj_id)
case obj.class.to_s.to_sym
when :Bid
@project = obj.courses[0]
end
end
def assort def assort
obj_class = params[:obj_class] obj_class = params[:obj_class]
obj_id = params[:obj_id] obj_id = params[:obj_id]

View File

@ -453,7 +453,7 @@ zh:
permission_export_wiki_pages: 导出 wiki 页面 permission_export_wiki_pages: 导出 wiki 页面
permission_manage_subtasks: 管理子任务 permission_manage_subtasks: 管理子任务
permission_view_journals_for_messages: 查看留言 permission_view_journals_for_messages: 查看留言
permission_view_courses: 查看课程列表 permission_view_courses: 查看课程
permission_new_course: 新建课程 permission_new_course: 新建课程
permission_configure_course: 配置课程 permission_configure_course: 配置课程
permission_close_course: 关闭/重开课程 permission_close_course: 关闭/重开课程
@ -471,7 +471,7 @@ zh:
permission_view_placeholder: 查看占位 permission_view_placeholder: 查看占位
permission_view_course_messages: 查看留言 permission_view_course_messages: 查看留言
permission_view_real_name: 查看真名 permission_view_real_name: 查看真名
permission_view_students: 查看学生列表 permission_view_students: 查看成员
permission_export_homeworks: 导出作业 permission_export_homeworks: 导出作业

View File

@ -197,9 +197,9 @@ Redmine::AccessControl.map do |map|
map.permission :view_assignment,{:projects => [:homework]},:read => true map.permission :view_assignment,{:projects => [:homework]},:read => true
map.permission :view_placeholder,{:bids => [:show_project]},:read => true map.permission :view_placeholder,{:bids => [:show_project]},:read => true
map.permission :view_course_messages,{:projects => [:feedback]},:read => true map.permission :view_course_messages,{:projects => [:feedback]},:read => true
map.permission :view_real_name,{},:read => true map.permission :view_real_name,{:projects => [:real_name]},:read => true
map.permission :view_students,{}, :read=>true map.permission :view_students,{:projects => [:member]}, :read=>true
map.permission :export_homeworks,{},:read => true map.permission :export_homeworks,{:zipdown => [:assort,:download_user_homework]},:read => true
end end
map.project_module :boards do |map| map.project_module :boards do |map|