jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Signed-off-by: alan <547533434@qq.com>

This commit is contained in:
alan 2015-06-18 15:33:01 +08:00
parent 59efe5b7e0
commit 9d172efcaa
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/controllers/courses_controller.rb
View File

@ -60,7 +60,7 @@ class CoursesController < ApplicationController
end end
end end
def join_private_courses def join_private_courses
respond_to do |format| respond_to do |format|
format.js format.js
@ -73,14 +73,14 @@ class CoursesController < ApplicationController
c = cs.edit_course params,@course,User.current c = cs.edit_course params,@course,User.current
@course = c[:course] @course = c[:course]
if @course.errors.full_messages.count <= 0 if @course.errors.full_messages.count <= 0
respond_to do |format| respond_to do |format|
format.html { format.html {
# render :layout => 'base_courses' # render :layout => 'base_courses'
flash[:notice] = l(:notice_successful_update) flash[:notice] = l(:notice_successful_update)
redirect_to settings_course_url(@course) redirect_to settings_course_url(@course)
} }
format.api { render_api_ok } format.api { render_api_ok }
end end
else else
respond_to do |format| respond_to do |format|
format.html { format.html {
@ -308,7 +308,7 @@ class CoursesController < ApplicationController
def member def member
## 有角色参数的才是课程，没有的就是项目 ## 有角色参数的才是课程，没有的就是项目
if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course))) if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
@render_file = 'new_member_list' @render_file = 'new_member_list'
@score_sort_by = "desc" @score_sort_by = "desc"
@canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1' @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
@ -450,24 +450,24 @@ class CoursesController < ApplicationController
end end
else else
respond_to do |format| respond_to do |format|
format.html { format.html {
# render :layout => 'base_courses' # render :layout => 'base_courses'
flash[:notice] = l(:notice_successful_create) flash[:notice] = l(:notice_successful_create)
if params[:continue] if params[:continue]
redirect_to new_course_url(attrs, :course => '0') redirect_to new_course_url(attrs, :course => '0')
elsif params[:course_continue] elsif params[:course_continue]
redirect_to new_course_url(:course => '1') redirect_to new_course_url(:course => '1')
else else
redirect_to settings_course_url(@course, :course_type => 1) redirect_to settings_course_url(@course, :course_type => 1)
end end
} }
format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) } format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
end end
end end
end end
def course def course
@school_id = params[:school_id] @school_id = params[:school_id]
per_page_option = 10 per_page_option = 10
if @school_id == "0" or @school_id.nil? if @school_id == "0" or @school_id.nil?
@courses_all = Course.active.visible. @courses_all = Course.active.visible.
@ -551,8 +551,8 @@ class CoursesController < ApplicationController
def index def index
if !User.current.admin? if !User.current.admin?
render_404 render_404
return return
end end
@course_type = params[:course_type] @course_type = params[:course_type]
@school_id = params[:school_id] @school_id = params[:school_id]
@ -601,7 +601,7 @@ class CoursesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { format.html {
render :layout => 'base' render :layout => 'base'
} }
format.atom { format.atom {
courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
@ -701,7 +701,7 @@ class CoursesController < ApplicationController
if Rails.env.production? && Setting.course_cahce_enabled? if Rails.env.production? && Setting.course_cahce_enabled?
events = Rails.cache.read(key) || [] events = Rails.cache.read(key) || []
end end
if events.empty? if events.empty?
@authors.each do |author| @authors.each do |author|
@activity = Redmine::Activity::Fetcher.new(User.current, :course => @course, @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
:with_subprojects => false, :with_subprojects => false,
@ -719,7 +719,7 @@ class CoursesController < ApplicationController
Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled? Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
end end
else else
# @author = @course.teacher # @author = @course.teacher
@activity = Redmine::Activity::Fetcher.new(User.current, :course => @course, @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
:with_subprojects => false, :with_subprojects => false,
:author => @author) :author => @author)
@ -781,7 +781,6 @@ class CoursesController < ApplicationController
end end
@jour = paginateHelper @jours,10 @jour = paginateHelper @jours,10
@state = false @state = false
@page = page.nil? ? "1" : page
respond_to do |format| respond_to do |format|
format.html{render :layout => 'base_courses'} format.html{render :layout => 'base_courses'}
format.api format.api
@ -838,7 +837,7 @@ class CoursesController < ApplicationController
def can_show_course def can_show_course
@first_page = FirstPage.find_by_page_type('project') @first_page = FirstPage.find_by_page_type('project')
if @first_page.try(:show_course) == 2 if @first_page.try(:show_course) == 2
render_404 render_404
end end
end end