hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'guange_dev' into szzh

Browse Source
memcached_alan^2
sw 10 years ago
parent 016432ad08 ec1c9c2ac1
commit 78cb9815a7
19 changed files with 446 additions and 377 deletions
Show Stats Download Patch File Download Diff File

20
app/controllers/avatar_controller.rb
Unescape View File

@ -1,6 +1,6 @@
class AvatarController < ApplicationController class AvatarController < ApplicationController
include ActionView::Helpers::NumberHelper
#before_filter :set_cache_buster #before_filter :set_cache_buster
include AvatarHelper include AvatarHelper
@ -29,6 +29,10 @@ class AvatarController < ApplicationController
end end
if @temp_file && (@temp_file.size > 0) if @temp_file && (@temp_file.size > 0)
if @temp_file.size > Setting.upload_avatar_max_size.to_i
@status = 1
@msg = l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i))
elsif Trustie::Utils::Image.new(@temp_file.tempfile.path).image?
diskfile=disk_filename(@source_type,@source_id) diskfile=disk_filename(@source_type,@source_id)
@urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file)) @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
@ -56,16 +60,20 @@ class AvatarController < ApplicationController
md5.update(@temp_file) md5.update(@temp_file)
end end
end end
# self.digest = md5.hexdigest
Trustie::Utils::Image.new(diskfile,true).compress(300)
@status = 0
@msg = ''
else
@status = 2
@msg = l(:not_valid_image_file)
end
end end
@temp_file = nil @temp_file = nil
image = Trustie::Utils::Image.new(diskfile,true)
image.compress(300)
respond_to do |format| respond_to do |format|
format.json{ format.json{
render :inline => "#{@urlfile.to_s}?#{Time.now.to_i}",:content_type => 'text/html' render :inline => {status: @status, message:@msg, url:"#{@urlfile.to_s}?#{Time.now.to_i}"}.to_json,:content_type => 'text/html'
return return
} }
format.js format.js

2
app/views/layouts/base_users.html.erb
Unescape View File

@ -199,7 +199,7 @@
</td> </td>
<% end %> <% end %>
</tr> </tr>
<% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation.empty? %> <% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation %>
<tr> <tr>
<td style=" float: right" width="70px"> <td style=" float: right" width="70px">
<span style="float: right"> <%= l(:field_occupation) %>：</span> <span style="float: right"> <%= l(:field_occupation) %>：</span>

4
app/views/news/_course_news.html.erb
Unescape View File

@ -36,9 +36,9 @@
<%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %> <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
<br /> <br />
<div class="cl mb5"></div> <div class="cl mb5"></div>
<p id="news_description_<%= news.id %>" class="news_description mt5"> <div id="news_description_<%= news.id %>" class="news_description mt5">
<%= news.description.html_safe %> <%= news.description.html_safe %>
</p> </div>
<div class="news_foot c_red" style="cursor:pointer;display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"> <div class="news_foot c_red" style="cursor:pointer;display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>">
<%= l(:button_more)%>... <%= l(:button_more)%>...
<span class="g-arr-down"></span> <span class="g-arr-down"></span>

1
config/locales/commons/en.yml
Unescape View File

@ -113,6 +113,7 @@ en:
one: "1 error prohibited this %{model} from being saved" one: "1 error prohibited this %{model} from being saved"
other: "%{count} errors prohibited this %{model} from being saved" other: "%{count} errors prohibited this %{model} from being saved"
messages: messages:
record_invalid: "validate error: %{errors}"
inclusion: "is not included in the list" inclusion: "is not included in the list"
exclusion: "is reserved" exclusion: "is reserved"
invalid: "is invalid" invalid: "is invalid"

1
config/locales/commons/zh.yml
Unescape View File

@ -121,6 +121,7 @@ zh:
one: "由于发生了一个错误 %{model} 无法保存" one: "由于发生了一个错误 %{model} 无法保存"
other: "%{count} 个错误使得 %{model} 无法保存" other: "%{count} 个错误使得 %{model} 无法保存"
messages: messages:
record_invalid: "校验失败: %{errors}"
inclusion: "不包含于列表中" inclusion: "不包含于列表中"
exclusion: "是保留关键字" exclusion: "是保留关键字"
invalid: "是无效的" invalid: "是无效的"

1
config/locales/en.yml
Unescape View File

@ -1521,4 +1521,5 @@ en:
label_commit_failed: commit failed label_commit_failed: commit failed
#api end #api end
error_upload_avatar_to_large: "too big (%{max_size})" error_upload_avatar_to_large: "too big (%{max_size})"
not_valid_image_file: not a valid image file

1
config/locales/zh.yml
Unescape View File

@ -1985,3 +1985,4 @@ zh:
label_code: 代码 label_code: 代码
error_upload_avatar_to_large: "超过大小限制 (%{max_size})" error_upload_avatar_to_large: "超过大小限制 (%{max_size})"
not_valid_image_file: 不是有效的图片文件

2
lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
Unescape View File

@ -4,6 +4,7 @@ module RailsKindeditor
def kindeditor_tag(name, content = nil, options = {}) def kindeditor_tag(name, content = nil, options = {})
id = sanitize_to_id(name) id = sanitize_to_id(name)
input_html = { :id => id }.merge(options.delete(:input_html) || {}) input_html = { :id => id }.merge(options.delete(:input_html) || {})
input_html = input_html.merge(style: 'display:none')
output = ActiveSupport::SafeBuffer.new output = ActiveSupport::SafeBuffer.new
output << text_area_tag(name, content, input_html) output << text_area_tag(name, content, input_html)
output << javascript_tag(js_replace(id, options.merge(window_onload: 'true'))) output << javascript_tag(js_replace(id, options.merge(window_onload: 'true')))
@ -12,6 +13,7 @@ module RailsKindeditor
def kindeditor(name, method, options = {}) def kindeditor(name, method, options = {})
# TODO: Refactory options: 1. kindeditor_option 2. html_option # TODO: Refactory options: 1. kindeditor_option 2. html_option
input_html = (options.delete(:input_html) || {}).stringify_keys input_html = (options.delete(:input_html) || {}).stringify_keys
input_html = input_html.merge(style: 'display:none')
output_buffer = ActiveSupport::SafeBuffer.new output_buffer = ActiveSupport::SafeBuffer.new
output_buffer << build_text_area_tag(name, method, self, options, input_html) output_buffer << build_text_area_tag(name, method, self, options, input_html)
output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true'))) output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true')))

28
lib/trustie/utils/image.rb
Unescape View File

@ -3,11 +3,37 @@
module Trustie module Trustie
module Utils module Utils
class Image class Image
def initialize(file, bak) def initialize(file, bak=false)
@file = file @file = file
@bak = bak @bak = bak
end end
def bitmap?(data)
data[0,2]==77.chr + 66.chr
end
def gif?(data)
data[0,4]==71.chr + 73.chr + 70.chr + 56.chr
end
def jpeg?(data)
data[0,4]== 0xff.chr + 0xd8.chr + 0xff.chr + 0xe0.chr
end
def png?(data)
data[0,2]==0x89.chr + 80.chr
end
def image?
begin
f = File.open(@file,'rb') # rb means to read using binary
return false if f.size < 9
data = f.read(9) # magic numbers are up to 9 bytes
return bitmap?(data) || gif?(data) || jpeg?(data) || png?(data)
ensure
f.close
end
end
def compress(size=300) def compress(size=300)
backup if @bak backup if @bak
begin begin

302
public/javascripts/course.js
Unescape View File

@ -1,6 +1,5 @@
//配置课程信息 //配置课程信息
function course_setting(id) function course_setting(id) {
{
//alert(id); //alert(id);
$('#tb_' + id).removeClass().addClass("hwork_hovertab"); $('#tb_' + id).removeClass().addClass("hwork_hovertab");
$('#tbc_0' + id).removeClass().addClass("dis"); $('#tbc_0' + id).removeClass().addClass("dis");
@ -17,28 +16,26 @@ $(function(){
function add_group(url, course_id) { function add_group(url, course_id) {
var group_name = $('#group_name').val(); var group_name = $('#group_name').val();
$.get( $.get(
url, url, {
{ valid: "name", valid: "name",
value: group_name, value: group_name,
course_id: course_id }, course_id: course_id
},
function(data) { function(data) {
if (data.valid) { if (data.valid) {
$("#add_group_name").submit(); $("#add_group_name").submit();
} } else {
else
{
alert(data.message); alert(data.message);
} }
} }
); );
} }
//修改分班:修改分班时得考虑什么都不改但是点击确定的情况 //修改分班:修改分班时得考虑什么都不改但是点击确定的情况
function edit_group(id,url,course_id,group_id)
{ function edit_group(id, url, course_id, group_id) {
var group_name = $('#' + id).val(); var group_name = $('#' + id).val();
$.get( $.get(
url, url, {
{
valid: "name", valid: "name",
value: group_name, value: group_name,
course_id: course_id, course_id: course_id,
@ -47,104 +44,84 @@ function edit_group(id,url,course_id,group_id)
function(data) { function(data) {
if (data.valid) { if (data.valid) {
$("#update_group_" + group_id).submit(); $("#update_group_" + group_id).submit();
} } else {
else
{
alert(data.message); alert(data.message);
} }
} }
); );
} }
function hidden_homework_score_form() function hidden_homework_score_form() {
{
hideModal($("#user_score")); hideModal($("#user_score"));
} }
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////新建课程相关 ///////////////////////////////////////////////////////////////新建课程相关
//验证课程名称 //验证课程名称
function regex_course_name()
{ function regex_course_name() {
var name = $.trim($("#course_name").val()); var name = $.trim($("#course_name").val());
if(name.length == 0) if (name.length == 0) {
{
$("#course_name_notice").show(); $("#course_name_notice").show();
return false; return false;
} } else {
else
{
$("#course_name_notice").hide(); $("#course_name_notice").hide();
return true; return true;
} }
} }
//验证课程学时 //验证课程学时
function regex_course_class_period()
{ function regex_course_class_period() {
var class_period = $.trim($("#class_period").val()); var class_period = $.trim($("#class_period").val());
var regex = /^\d*$/; var regex = /^\d*$/;
if(class_period.length == 0) if (class_period.length == 0) {
{
$("#course_class_period_notice").html("学时总数不能为空"); $("#course_class_period_notice").html("学时总数不能为空");
$("#course_class_period_notice").show(); $("#course_class_period_notice").show();
return false; return false;
} } else if (regex.test(class_period)) {
else if (regex.test(class_period)) { if (parseInt(class_period) > 0) {
if(parseInt(class_period) > 0)
{
$("#course_class_period_notice").html(""); $("#course_class_period_notice").html("");
$("#course_class_period_notice").hide(); $("#course_class_period_notice").hide();
return true; return true;
} } else {
else
{
$("#course_class_period_notice").html("学时总数必须大于0"); $("#course_class_period_notice").html("学时总数必须大于0");
$("#course_class_period_notice").show(); $("#course_class_period_notice").show();
return false; return false;
} }
} } else {
else
{
$("#course_class_period_notice").html("学时总数必须为数字"); $("#course_class_period_notice").html("学时总数必须为数字");
$("#course_class_period_notice").show(); $("#course_class_period_notice").show();
return false; return false;
} }
} }
//验证密码 //验证密码
function regex_course_password()
{ function regex_course_password() {
var class_period = $.trim($("#course_course_password").val()); var class_period = $.trim($("#course_course_password").val());
var regex = /^\w+$/; var regex = /^\w+$/;
if(class_period.length == 0) if (class_period.length == 0) {
{
$("#course_course_password_notice").html("课程密码不能为空"); $("#course_course_password_notice").html("课程密码不能为空");
$("#course_course_password_notice").show(); $("#course_course_password_notice").show();
return false; return false;
} } else if (regex.test(class_period)) {
else if (regex.test(class_period)) {
$("#course_course_password_notice").html(""); $("#course_course_password_notice").html("");
$("#course_course_password_notice").hide(); $("#course_course_password_notice").hide();
return true; return true;
} } else {
else
{
$("#course_course_password_notice").html("课程密码有非法字符"); $("#course_course_password_notice").html("课程密码有非法字符");
$("#course_course_password_notice").show(); $("#course_course_password_notice").show();
return false; return false;
} }
} }
//提交新建课程 //提交新建课程
function submit_new_course()
{ function submit_new_course() {
if(regex_course_name()&&regex_course_class_period()&&regex_course_password()) if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
{
$("#new_course").submit(); $("#new_course").submit();
} }
} }
function submit_edit_course(id) function submit_edit_course(id) {
{ if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
{
$("#edit_course_" + id).submit(); $("#edit_course_" + id).submit();
} }
} }
@ -159,14 +136,14 @@ function regexSubject(id) {
$(message).text("主题不能为空"); $(message).text("主题不能为空");
$(message).css('color', '#ff0000'); $(message).css('color', '#ff0000');
return false; return false;
} } else {
else {
$(message).text("填写正确"); $(message).text("填写正确");
$(message).css('color', '#008000'); $(message).css('color', '#008000');
return true; return true;
} }
return false; return false;
} }
function regexContent(id) { function regexContent(id) {
var contentid = "#message_content" + id; var contentid = "#message_content" + id;
var message = "#message_content_span" + id; var message = "#message_content_span" + id;
@ -175,8 +152,7 @@ function regexContent(id) {
$(message).text("描述不能为空"); $(message).text("描述不能为空");
$(message).css('color', '#ff0000'); $(message).css('color', '#ff0000');
return false; return false;
} } else {
else {
$(message).text("填写正确"); $(message).text("填写正确");
$(message).css('color', '#008000'); $(message).css('color', '#008000');
return true; return true;
@ -195,24 +171,18 @@ function submitProjectsBoard(id) {
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////// 课程通知 /////////////////////////////////////////////////////////////// 课程通知
function regexTitle() function regexTitle() {
{
var name = $("#news_title").val(); var name = $("#news_title").val();
if(name.length ==0) if (name.length == 0) {
{
$("#title_notice_span").text("标题不能为空"); $("#title_notice_span").text("标题不能为空");
$("#title_notice_span").css('color', '#ff0000'); $("#title_notice_span").css('color', '#ff0000');
$("#news_title").focus(); $("#news_title").focus();
return false; return false;
} } else if (name.length <= 60) {
else if(name.length <= 60)
{
$("#title_notice_span").text("填写正确"); $("#title_notice_span").text("填写正确");
$("#title_notice_span").css('color', '#008000'); $("#title_notice_span").css('color', '#008000');
return true; return true;
} } else {
else
{
$("#title_notice_span").text("标题超过60个字符"); $("#title_notice_span").text("标题超过60个字符");
$("#title_notice_span").css('color', '#ff0000'); $("#title_notice_span").css('color', '#ff0000');
$("#news_title").focus(); $("#news_title").focus();
@ -220,62 +190,50 @@ function regexTitle()
} }
} }
function regexDescription() function regexDescription() {
{
var name = news_description_editor.html(); var name = news_description_editor.html();
if(name.length ==0) if (name.length == 0) {
{
$("#description_notice_span").text("描述不能为空"); $("#description_notice_span").text("描述不能为空");
$("#description_notice_span").css('color', '#ff0000'); $("#description_notice_span").css('color', '#ff0000');
$("#description_notice_span").focus(); $("#description_notice_span").focus();
return false; return false;
} } else if (name.length >= 6000) {
else if(name.length >=6000){
$("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)"); $("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)");
$("#description_notice_span").css('color', '#ff0000'); $("#description_notice_span").css('color', '#ff0000');
$("#description_notice_span").focus(); $("#description_notice_span").focus();
return false; return false;
} } else {
else
{
$("#description_notice_span").text("填写正确"); $("#description_notice_span").text("填写正确");
$("#description_notice_span").css('color', '#008000'); $("#description_notice_span").css('color', '#008000');
return true; return true;
} }
} }
function submitNews() function submitNews() {
{ if (regexTitle() && regexDescription()) {
if(regexTitle() && regexDescription())
{
news_description_editor.sync(); news_description_editor.sync();
$("#news-form").submit(); $("#news-form").submit();
} }
} }
function submitFocus(obj) function submitFocus(obj) {
{
$(obj).focus(); $(obj).focus();
} }
function submitComment() function submitComment() {
{
comment_editor.sync(); comment_editor.sync();
$("#add_comment_form").submit(); $("#add_comment_form").submit();
} }
/////////////////////////////////////////////////课程讨论区 /////////////////////////////////////////////////课程讨论区
function course_board_submit_message_replay() function course_board_submit_message_replay() {
{ if (MessageReplayVevify()) {
if(MessageReplayVevify())
{
message_content_editor.sync(); //提交内容之前要sync，不然服务器端取不到值 message_content_editor.sync(); //提交内容之前要sync，不然服务器端取不到值
$("#message_form").submit(); $("#message_form").submit();
} }
} }
function course_board_canel_message_replay() function course_board_canel_message_replay() {
{
$("#reply").hide(200); $("#reply").hide(200);
$("#message_quote").html(""); $("#message_quote").html("");
} }
@ -286,8 +244,7 @@ function MessageReplayVevify() {
$("#message_content_span").text("回复不能为空"); $("#message_content_span").text("回复不能为空");
$("#message_content_span").css('color', '#ff0000'); $("#message_content_span").css('color', '#ff0000');
return false; return false;
} } else {
else {
$("#message_content_span").text("填写正确"); $("#message_content_span").text("填写正确");
$("#message_content_span").css('color', '#008000'); $("#message_content_span").css('color', '#008000');
return true; return true;
@ -298,70 +255,62 @@ function MessageReplayVevify() {
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
//验证搜索时输入名字 //验证搜索时输入名字
function regexName(content) function regexName(content) {
{
var name = $.trim($("#name").val()); var name = $.trim($("#name").val());
if(name.length == 0) if (name.length == 0) {
{
$("#project_name_span").text(content); $("#project_name_span").text(content);
$("#project_name_span").css('color', '#ff0000'); $("#project_name_span").css('color', '#ff0000');
$("#project_name_span").focus(); $("#project_name_span").focus();
return false; return false;
} } else {
else
{
$("#project_name_span").text(""); $("#project_name_span").text("");
return true; return true;
} }
} }
//提交搜索 //提交搜索
function submitSerch(content)
{ function submitSerch(content) {
if(regexName(content)){$("#course_search_form").submit();} if (regexName(content)) {
$("#course_search_form").submit();
}
} }
//验证搜索时输入名字 //验证搜索时输入名字
function regexQ(content) function regexQ(content) {
{
var name = $.trim($("#q").val()); var name = $.trim($("#q").val());
if(name.length == 0) if (name.length == 0) {
{
$("#course_member_name_span").text(content); $("#course_member_name_span").text(content);
$("#course_member_name_span").css('color', '#ff0000'); $("#course_member_name_span").css('color', '#ff0000');
$("#course_member_name_span").focus(); $("#course_member_name_span").focus();
return false; return false;
} } else {
else
{
$("#course_member_name_span").text(""); $("#course_member_name_span").text("");
return true; return true;
} }
} }
//提交课程成员搜索 //提交课程成员搜索
function submitMemberSerch(content)
{ function submitMemberSerch(content) {
//if(regexQ(content)){$("#course_member_search_form").submit();} //if(regexQ(content)){$("#course_member_search_form").submit();}
$("#course_member_search_form").submit(); $("#course_member_search_form").submit();
} }
//课程描述显示更多信息 //课程描述显示更多信息
function show_more_msg() function show_more_msg() {
{
$("#course_description").toggleClass("course_description_none"); $("#course_description").toggleClass("course_description_none");
} }
//作业描述显示更多信息 //作业描述显示更多信息
function news_show_more_des(id)
{ function news_show_more_des(id) {
$('#news_description_' + id).toggleClass("news_description_none"); $('#news_description_' + id).toggleClass("news_description_none");
} }
function bid_show_more_des(id)
{ function bid_show_more_des(id) {
$("#bid_description_" + id).toggleClass("news_description_none"); $("#bid_description_" + id).toggleClass("news_description_none");
} }
//课程作业结束时间倒计时 //课程作业结束时间倒计时
function show_bid_dead_line(year,month,day,divname) function show_bid_dead_line(year, month, day, divname) {
{
var now = new Date(); var now = new Date();
var endDate = new Date(year, month - 1, day); var endDate = new Date(year, month - 1, day);
var leftTime = endDate.getTime() - now.getTime(); var leftTime = endDate.getTime() - now.getTime();
@ -370,64 +319,43 @@ function show_bid_dead_line(year,month,day,divname)
var hour = Math.floor((leftsecond - day1 * 24 * 60 * 60) / 3600); var hour = Math.floor((leftsecond - day1 * 24 * 60 * 60) / 3600);
var minute = Math.floor((leftsecond - day1 * 24 * 60 * 60 - hour * 3600) / 60); var minute = Math.floor((leftsecond - day1 * 24 * 60 * 60 - hour * 3600) / 60);
var second = Math.floor(leftsecond - day1 * 24 * 60 * 60 - hour * 3600 - minute * 60); var second = Math.floor(leftsecond - day1 * 24 * 60 * 60 - hour * 3600 - minute * 60);
$("#"+divname).html("<form name='formnow' class='fr'>" $("#" + divname).html("<form name='formnow' class='fr'>" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + day1 + "' > 天" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + hour + "' > 小时" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + minute + "' > 分" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + second + "' > 秒" + "</form>" + "<p class='fr'>作品提交还剩：</p>");
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+day1+"' > 天"
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+hour+"' > 小时"
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分"
+ "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒"
+ "</form>"
+ "<p class='fr'>作品提交还剩：</p>");
} }
//验证新建作业的名字 //验证新建作业的名字
function regex_bid_name()
{ function regex_bid_name() {
var name = $.trim($("#bid_name").val()); var name = $.trim($("#bid_name").val());
if(name=="") if (name == "") {
{
$("#bid_name_span").text("名称不能为空"); $("#bid_name_span").text("名称不能为空");
return false; return false;
} } else {
else
{
$("#bid_name_span").text(""); $("#bid_name_span").text("");
return true; return true;
} }
} }
//验证匿评数量 //验证匿评数量
function regex_evaluation_num() function regex_evaluation_num() {
{
var evaluation_num = $.trim($("#bid_evaluation_num").val()); var evaluation_num = $.trim($("#bid_evaluation_num").val());
var regex = /^\d+$/; var regex = /^\d+$/;
if($("#bid_open_anonymous_evaluation").attr("checked") == "checked") if ($("#bid_open_anonymous_evaluation").attr("checked") == "checked") {
{ if (evaluation_num == "") {
if(evaluation_num=="")
{
$("#bid_evaluation_num_span").text("匿评分配数量不能为空"); $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
return false; return false;
} } else if (regex.test(evaluation_num)) {
else if(regex.test(evaluation_num)) if (evaluation_num > 0) {
{
if(evaluation_num > 0)
{
$("#bid_evaluation_num_span").text(""); $("#bid_evaluation_num_span").text("");
return true; return true;
} } else {
else
{
$("#bid_evaluation_num_span").text("匿评分配数量必须为大于0"); $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
return false; return false;
} }
} } else {
else
{
$("#bid_evaluation_num_span").text("匿评分配数量只能为数字"); $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
return false; return false;
} }
} } else {
else
{
return true; return true;
} }
} }
@ -435,22 +363,17 @@ function regex_evaluation_num()
//点击是否开启匿评单选框效果 //点击是否开启匿评单选框效果
$(function() { $(function() {
$("#bid_open_anonymous_evaluation").click(function() { $("#bid_open_anonymous_evaluation").click(function() {
if($("#bid_open_anonymous_evaluation").attr("checked") == "checked") if ($("#bid_open_anonymous_evaluation").attr("checked") == "checked") {
{
$("#bid_evaluation_num_li").slideDown(); $("#bid_evaluation_num_li").slideDown();
} } else {
else
{
$("#bid_evaluation_num_li").slideUp(); $("#bid_evaluation_num_li").slideUp();
} }
}); });
}); });
//老师提交新建作业 //老师提交新建作业
function submit_new_bid(id) function submit_new_bid(id) {
{ if (regex_bid_name() && regex_evaluation_num()) {
if(regex_bid_name()&&regex_evaluation_num())
{
bid_description_editor.sync(); bid_description_editor.sync();
$("#" + id).submit(); $("#" + id).submit();
} }
@ -469,15 +392,13 @@ function close_window(id1,id2){
} }
//隐藏提示狂 //隐藏提示狂
function hidden_atert_form(cur_page,cur_type) function hidden_atert_form(cur_page, cur_type) {
{
hideModal($("#popbox")); hideModal($("#popbox"));
} }
//当课程描述长度小于112px时，不显示更多按钮 //当课程描述长度小于112px时，不显示更多按钮
$(function() { $(function() {
if($("#course_description_content").height()>112) if ($("#course_description_content").height() > 112) {
{
$("#lg-foot").show(); $("#lg-foot").show();
} }
}); });
@ -496,15 +417,13 @@ $(document).ready(function () {
}; };
if (browser.mozilla || browser.opera) { if (browser.mozilla || browser.opera) {
$("pre").addClass("break_word_firefox"); $("pre").addClass("break_word_firefox");
} } else {
else{
$("pre").addClass("break_word"); $("pre").addClass("break_word");
} }
}); });
// 日历选择日期后关闭 // 日历选择日期后关闭
function regexDeadLine() function regexDeadLine() {
{
('#ui-datepicker-div').hide; ('#ui-datepicker-div').hide;
} }
@ -518,21 +437,28 @@ $(function(){
//课程通知更多按钮显示 //课程通知更多按钮显示
$(function() { $(function() {
$('.news_description').each(function() { $('.news_description').each(function() {
if($(this).height() >= 38) if ($(this).height() >= 38) {
{
$('#news_foot_' + $(this).attr('id').replace('news_description_', '')).css("display", "block"); $('#news_foot_' + $(this).attr('id').replace('news_description_', '')).css("display", "block");
} }
});
$(".news_description img").one('load', function() {
var node = $(this).parents('.news_description');
if (node && node.height() >= 38) {
$('#news_foot_' + node.attr('id').replace('news_description_', '')).css("display", "block");
}
}).each(function() {
if (this.complete) {
$(this).load();
} }
) });
}); });
//查找TAG资源 //查找TAG资源
function search_tag_attachment(url,tag_name,q,course_id,sort) function search_tag_attachment(url, tag_name, q, course_id, sort) {
{
//alert("111"); //alert("111");
$.get( $.get(
url, url, {
{
tag_name: tag_name, tag_name: tag_name,
q: q, q: q,
course_id: course_id course_id: course_id
@ -546,27 +472,22 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
// 课程讨论区 // 课程讨论区
function showhelpAndScrollToMessage(id, id1, count) { function showhelpAndScrollToMessage(id, id1, count) {
$('#' + id).toggle(); $('#' + id).toggle();
if(cookieget("repositories_visiable") == "true") if (cookieget("repositories_visiable") == "true") {
{
cookiesave("repositories_visiable", false, '', '', ''); cookiesave("repositories_visiable", false, '', '', '');
} } else {
else
{
cookiesave("repositories_visiable", true, '', '', ''); cookiesave("repositories_visiable", true, '', '', '');
} }
var information = $(id1); var information = $(id1);
var val = information.attr("value"); var val = information.attr("value");
if(val=="show_help") if (val == "show_help") {
{
$(id1).text("收起回复(" + count + ")"); $(id1).text("收起回复(" + count + ")");
information.attr("value", "hide_help"); information.attr("value", "hide_help");
} } else {
else
{
$(id1).text("展开回复(" + count + ")"); $(id1).text("展开回复(" + count + ")");
information.attr("value", "show_help"); information.attr("value", "show_help");
} }
} }
function show_more_reply(contentid, id2, id3) { function show_more_reply(contentid, id2, id3) {
$(contentid).toggleClass("course_description_none"); $(contentid).toggleClass("course_description_none");
var information = $(id2); var information = $(id2);
@ -576,8 +497,7 @@ function show_more_reply(contentid, id2, id3) {
$(id2).text("[收起]"); $(id2).text("[收起]");
information.attr("value", "hide_more"); information.attr("value", "hide_more");
arrow.attr("src", "/images/jiantouup.jpg") arrow.attr("src", "/images/jiantouup.jpg")
} } else {
else {
$(id2).text("[展开]"); $(id2).text("[展开]");
information.attr("value", "show_more"); information.attr("value", "show_more");
arrow.attr("src", "/images/jiantou.jpg") arrow.attr("src", "/images/jiantou.jpg")

11
public/javascripts/jq-upload/upload.js
Unescape View File

@ -44,9 +44,18 @@ $(function() {
}, },
done: function(e, data) { done: function(e, data) {
var imgSpan = jQuery('#avatar_image'); var imgSpan = jQuery('#avatar_image');
var result = data.result.text ? data.result.text() : data.result;
if(result){
var o = JSON.parse(result);
if(o.status == 0){
imgSpan.attr({ imgSpan.attr({
"src": data.result.text ? data.result.text() : data.result "src": o.url
}); });
} else {
alert(o.message);
}
}
} }
}); });
}); });

1
public/stylesheets/application.css
Unescape View File

@ -2794,3 +2794,4 @@ div.repos_explain{
padding-bottom: 20px; padding-bottom: 20px;
} }
.upload_img img{max-width: 100%;} .upload_img img{max-width: 100%;}
#activity .upload_img img{width: 580px;}

10
spec/factories/attachments.rb
Unescape View File

@ -0,0 +1,10 @@
#coding=utf-8
#
FactoryGirl.define do
factory :attachment do
filename "11.gif"
filesize 296833
digest "8a74e086d7716f89bc4fbac0606589c7"
disk_directory "2015/05"
end
end

17
spec/factories/homeworks.rb
Unescape View File

@ -0,0 +1,17 @@
#coding=utf-8
#
#:author_id, :budget, :deadline, :name, :description, :homework_type, :password
FactoryGirl.define do
factory :homework, class: Bid do
name "test homework"
budget 0
deadline {(Time.now+1.days).strftime('%Y-%m-%d')}
description "description"
homework_type 3
reward_type 3
end
factory :homework_attach, class: HomeworkAttach do
end
end

8
spec/factories/users.rb
Unescape View File

@ -6,4 +6,12 @@ FactoryGirl.define do
password "foobar111" password "foobar111"
password_confirmation "foobar111" password_confirmation "foobar111"
end end
factory :student, class: User do
login "student"
mail "student@example.com"
password "foobar111"
password_confirmation "foobar111"
end
end end

5
spec/models/forum_observer_spec.rb
Unescape View File

@ -1,5 +0,0 @@
require 'spec_helper'
describe ForumObserver do
pending "add some examples to (or delete) #{__FILE__}"
end

5
spec/models/memo_observer_spec.rb
Unescape View File

@ -1,5 +0,0 @@
require 'spec_helper'
describe MemoObserver do
pending "add some examples to (or delete) #{__FILE__}"
end

42
spec/requests/course_request_spec.rb
Unescape View File

@ -35,13 +35,53 @@ RSpec.describe "课程", :type => :request do
context "修改课程图片" do context "修改课程图片" do
include Rack::Test::Methods include Rack::Test::Methods
let(:avatar) {Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/test.jpg",'image/jpg')} let(:avatar) {Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/test.jpg",'image/jpg')}
context "正常图片上传成功" do context "正常图片上传成功" do
subject(:resp) {post upload_avatar_path(source_type: 'Course', source_id: course.id, format: :json),"avatar"=>{image: avatar}} subject(:resp) {post upload_avatar_path(source_type: 'Course', source_id: course.id, format: :json),"avatar"=>{image: avatar}}
it{ expect(subject).to be_ok } it{ expect(subject).to be_ok }
it{ expect(subject.body).not_to be_empty } it{ expect(subject.body).not_to be_empty }
it "状态要为0" do
o = ActiveSupport::JSON.decode(subject.body)
expect(o["status"]).to eq(0)
end
it "要回传图片地址" do
o = ActiveSupport::JSON.decode(subject.body)
expect(o["url"]).not_to be_empty
end
end
context "不是图片，上传失败" do
let(:invalid_avatar) {Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/hah.txt",'text/plain')}
before do
resp = post upload_avatar_path(source_type: 'Course', source_id: course.id, format: :json),"avatar"=>{image: invalid_avatar}
@o = ActiveSupport::JSON.decode(resp.body)
end
it "状态不为0" do
expect(@o["status"]).not_to eq(0)
end
it "要回传错误信息" do
expect(@o["message"]).to be_include("图片")
end
end
context "文件过大，上传失败" do
before do
big_file = Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/test.jpg",'image/jpg')
allow(ActionDispatch::Http::UploadedFile).to receive(:new).and_return(double('BigFile',size: 10*1024*1024, original_filename: 'rais.jpg', tempfile: nil))
# trace = TracePoint.new(:call) do |tp|
# p [tp.lineno, tp.defined_class, tp.method_id, tp.event] if tp.method_id == :post
# end
resp = post upload_avatar_path(source_type: 'Course', source_id: course.id, format: :json),'avatar[image]'=> big_file
@o = ActiveSupport::JSON.decode(resp.body)
end
it "状态不为0" do
expect(@o["status"]).not_to eq(0)
end
it "要回传错误信息" do
expect(@o["message"]).to be_include("大")
end
end end
it "不是图片，上传失败"
end end
end end

34
spec/requests/zipdown_request_spec.rb
Unescape View File

@ -1,6 +1,40 @@
require 'rails_helper' require 'rails_helper'
require 'shared_account_spec'
# "attachments"=>{"1"=>{"filename"=>"11.gif", "description"=>"", "is_public_checkbox"=>"1", "token"=>"33731.8a74e086d7716f89bc4fbac0606589c7"}}
RSpec.describe "作业打包下载", :type => :request do RSpec.describe "作业打包下载", :type => :request do
let(:student){FactoryGirl.create(:student)}
describe "单独下载某学生作业" do describe "单独下载某学生作业" do
include_context "create user"
before {
FactoryGirl.create(:user)
shared_login
@homework = FactoryGirl.create(:homework, author_id: current_user.id)
@attch = HomeworkAttach.new
@attch.bid_id = @homework.id
@attch.user_id = student.id
@attachment = Attachment.new(:file => File.open(File.join(Rails.root, "spec/fixtures/test.jpg")))
@attachment.author = User.current
@attachment.container_type = 'HomeworkAttach'
@attachment.container_id = @attch.id
@attachment.filename = "test.jpg"
@attachment.save
params = {"1"=>{"filename" => "test.jpg", "description" =>"",
"is_public_checkbox"=>"1",
"token" => "#{@attachment.id}.#{@attachment.digest}" }
}
@attch.save_attachments(params)
@attch.name = "test.jpg"
@attch.save!
}
it "正常下载" do
uu = current_user
allow(uu).to receive(:admin?).and_return(true)
allow(User).to receive(:current).and_return(uu)
get zipdown_download_user_homework_path, {homework:@attch.id}
expect(response).to have_http_status(:success)
expect(response.content_type).to eq(Mime::Type.new("applcation/zip",:zip))
end
end end
end end

Write Preview
Loading…
Cancel
Save