diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 279e89f13..686f70a11 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -101,33 +101,12 @@ class AccountController < ApplicationController
# User self-registration
def register
- # @root_path="/home/pdl/redmine-2.3.2-0/apache2/"
-#
- #@cache_identityy = params[:identity]||"" #身份
- @cache_no = params[:no]||"" #学号
- @cache_technical_title = params[:technical_title]||"" #教师职称
- @cache_province = params[:province]||"" #省份
- @cache_city = params[:city]||"" #城市
- @cache_enterprise_name = params[:enterprise_name]||"" #企业
-
- firstname_code = ""
- lastname_code = ""
(redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
if request.get?
session[:auth_source_registration] = nil
@user = User.new(:language => current_language.to_s)
else
user_params = params[:user] || {}
- @user = User.new
- @user.safe_attributes = user_params
- if params[:identity] == "2" # 2 企业
- firstname_code = @user.firstname
- lastname_code = @user.lastname
- @user.firstname = params[:enterprise_name]
- @user.lastname = l(:field_enterprise)
- end
- @user.admin = false
- @user.register
if session[:auth_source_registration]
@user.activate
@user.login = session[:auth_source_registration][:login]
@@ -139,36 +118,7 @@ class AccountController < ApplicationController
redirect_to my_account_path
end
else
- @user.login = params[:user][:login]
- unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
- @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
- end
-
-
-
- case Setting.self_registration
- when '1'
- register_by_email_activation(@user)
- when '3'
- register_automatically(@user)
- else
- register_manually_by_administrator(@user)
- end
-
- #added by bai
- if @user.id != nil
- ue = @user.user_extensions ||= UserExtensions.new
- #ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => )
- ue.identity = params[:identity].to_i
- ue.technical_title = params[:technical_title]
- ue.gender = params[:gender].to_i
- ue.user_id = @user.id
- ue.student_id = params[:no]
- ue.location = params[:province] if params[:province] != nil
- ue.location_city = params[:city] if params[:city] != nil
- ue.save
- end
-
+ create_and_save_user params[:user][:login],user_params[:password],user_params[:mail],user_params[:password_confirmation],true
end
end
if params[:identity] == "2"
@@ -177,6 +127,34 @@ class AccountController < ApplicationController
end
end
+ #should_confirmation_password是否验证密码
+ def create_and_save_user login,password,email,password_confirmation,should_confirmation_password
+ @user = User.new
+ @user.admin = false
+ @user.register
+ @user.login = login
+ @user.mail = email
+ if should_confirmation_password && !password.blank? && !password_confirmation.blank?
+ @user.password,@user.password_confirmation = password,password_confirmation
+ elsif !should_confirmation_password && !password.blank?
+ @user.password = password
+ end
+ case Setting.self_registration
+ when '1'
+ register_by_email_activation(@user)
+ when '3'
+ register_automatically(@user)
+ else
+ register_manually_by_administrator(@user)
+ end
+ if @user.id != nil
+ ue = @user.user_extensions ||= UserExtensions.new
+ ue.user_id = @user.id
+ ue.save
+ end
+ @user
+ end
+
# Token based account activation
def activate
(redirect_to(home_url); return) unless Setting.self_registration? && params[:token].present?
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 31463d691..111ec2cca 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -25,6 +25,7 @@ class AttachmentsController < ApplicationController
#before_filter :login_without_softapplication, only: [:download]
accept_api_auth :show, :download, :upload
require 'iconv'
+ include AttachmentsHelper
def show
@@ -346,8 +347,18 @@ class AttachmentsController < ApplicationController
def add_exist_file_to_courses
file = Attachment.find(params[:file_id])
courses = params[:courses][:course]
+ @message = ""
courses.each do |course|
c = Course.find(course);
+ if course_contains_attachment?(c,file)
+ if @message && @message == ""
+ @message += l(:label_course_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+ next
+ else
+ @message += "#{s.name} #{s.name} #{s.name} "
- options << "#{s.name} #{s.name} #{s.name} #{s.name} #{s.name} "
+ options << " #{s.name} "
end
options = "#{l(:label_school_not_fount)}
" if options.blank?
diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb
index a68d12517..b1705c826 100644
--- a/app/controllers/stores_controller.rb
+++ b/app/controllers/stores_controller.rb
@@ -26,19 +26,19 @@ class StoresController < ApplicationController
resultSet = Attachment.where("attachments.container_type IS NOT NULL AND filename LIKE :like ", like: "%#{keywords}%").
reorder("created_on DESC")
- # result = resultSet.to_a.dup
+ result = resultSet.to_a.dup
- # resultSet.to_a.map { |res|
- # if(res.container.nil? ||
- # (res.container.class.to_s=="Project" && res.container.is_public == false) ||
- # (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
- # (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
- # false
- # )
- # result.delete(res)
- # end
- # }
- # result
+ resultSet.to_a.map { |res|
+ if(res.container.nil? ||
+ (res.container.class.to_s=="Project" && res.container.is_public == false) ||
+ (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
+ (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
+ false
+ ) || (res.container.is_a?(Course) && res.container.is_public == 0)
+ result.delete(res)
+ end
+ }
+ result
end
LIMIT = 12 unless const_defined?(:LIMIT)
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 4e7768785..89fa0e1dc 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -47,7 +47,6 @@ class WordsController < ApplicationController
# 删除留言功能要调用destroy，也记得在destroy.js中修改
# deny api. api useless
- @show_real_name = params[:show_real_name] || false
parent_id = params[:reference_id]
author_id = User.current.id
reply_user_id = params[:reference_user_id]
diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 6cbe0dd95..cee26ae32 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -44,7 +44,7 @@ class ZipdownController < ApplicationController
if homework != nil
unless homework.attachments.empty?
zipfile = zip_homework_by_user homework
- send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
+ send_file zipfile, :filename => homework.user.user_extensions.student_id + "_" + homework.user.lastname + homework.user.firstname + "_" + homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
else
render file: 'public/no_file_found.html'
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9c5d8c9b5..8c2542aa2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -251,7 +251,7 @@ module ApplicationHelper
end
def toggle_link(name, id, options={})
- onclick = "$('##{id}').toggle(); "
+ onclick = "$('##{id}').slideToggle(); "
onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ")
onclick << "return false;"
link_to(name, "#", :onclick => onclick)
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index 3c882d393..50dd79a08 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -67,6 +67,28 @@ module AttachmentsHelper
end
end
+ def course_contains_attachment? course,attachment
+ course.attachments.each do |att|
+ if att.id == attachment.id || (!att.copy_from.nil? && !attachment.copy_from.nil? && att.copy_from == attachment.copy_from) || att.copy_from == attachment.id || att.id == attachment.copy_from
+ return true
+ end
+ end
+ false
+ end
+
+ def get_qute_number attachment
+ if attachment.copy_from
+ result = Attachment.find_by_sql("select count(*) as number from attachments where copy_from = #{attachment.copy_from}")
+ else
+ result = Attachment.find_by_sql("select count(*) as number from attachments where copy_from = #{attachment.id}")
+ end
+ if result.nil? || result.count <= 0
+ return 0
+ else
+ return result[0].number
+ end
+ end
+
private
def deletable? container, user=User.current
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 9e18c9f54..ccca6be9d 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -471,9 +471,9 @@ module CoursesHelper
end
#课程实践年份下拉框
- def course_time_option
+ def course_time_option year
type = []
- now_year = Time.now.year
+ now_year = year.nil? ? Time.now.year : (Time.now.year <= year ? Time.now.year : year)
for i in (now_year..now_year + 10)
option = []
option << i
@@ -507,6 +507,20 @@ module CoursesHelper
term
end
+ def course_in_current_or_next_term course
+ is_current_term = false
+ is_next_term = false
+ if course.time == Time.now.year && course.term == cur_course_term
+ is_current_term = true
+ end
+ if cur_course_term == "秋季学期" && course.time == (Time.now.year + 1) && course.term == "春季学期"
+ is_next_term = true
+ elsif cur_course_term == "春季学期" && course.time == Time.now.year && course.term == "秋季学期"
+ is_next_term = true
+ end
+ is_current_term || is_next_term
+ end
+
#获取课程动态
def get_course_activity courses, activities
@course_ids=activities.keys()
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index 399b7be1d..5683b9a05 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -47,18 +47,18 @@ module FilesHelper
def courses_check_box_tags(name,courses,current_course,attachment)
s = ''
courses.each do |course|
- if !(attachment.container_type && attachment.container_id == course.id) && is_course_teacher(User.current,course)
- s << "#{ check_box_tag name, course.id, false, :id => nil } #{h course.name} #{ check_box_tag name, course.id, false, :id => nil } #{h course.name} [#{get_course_term course}]
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index cf8b7d475..6e980957b 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -29,8 +29,16 @@
