Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts: db/schema.rb public/javascripts/course.js Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
commit
59c77e870c
|
|
@ -98,6 +98,7 @@ module Mobile
|
|||
params do
|
||||
requires :token, type: String
|
||||
requires :user_id, type: Integer,desc: '被留言的用户id'
|
||||
requires :page,type:Integer,desc:'请求数据的页码'
|
||||
end
|
||||
get ':user_id/messages' do
|
||||
us = UsersService.new
|
||||
|
|
@ -111,11 +112,13 @@ module Mobile
|
|||
requires :token, type: String
|
||||
requires :user_id, type: Integer,desc: '被留言的用户id'
|
||||
requires :content,type:String,desc:'留言内容'
|
||||
optional :refer_user_id,type:Integer,desc:'被回复的用户id'
|
||||
requires :ref_user_id,type:Integer,desc:'被回复的用户id'
|
||||
requires :parent_id,type:Integer,desc:'留言父id'
|
||||
requires :ref_message_id,type:Integer,desc:'引用消息id'
|
||||
end
|
||||
post ':user_id/leave_message' do
|
||||
us = UsersService.new
|
||||
jours = us.leave_messages params,current_user
|
||||
jours = us.reply_user_messages params,current_user
|
||||
present :status,0
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
class AvatarController < ApplicationController
|
||||
|
||||
|
||||
include ActionView::Helpers::NumberHelper
|
||||
#before_filter :set_cache_buster
|
||||
include AvatarHelper
|
||||
|
||||
|
|
@ -24,11 +24,16 @@ class AvatarController < ApplicationController
|
|||
else
|
||||
@image_file=params[:filename]
|
||||
end
|
||||
@temp_file = StringIO.new(@temp_file)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
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).image?
|
||||
diskfile=disk_filename(@source_type,@source_id)
|
||||
@urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
|
||||
|
||||
|
|
@ -46,6 +51,7 @@ class AvatarController < ApplicationController
|
|||
md5 = Digest::MD5.new
|
||||
File.open(diskfile, "wb") do |f|
|
||||
if @temp_file.respond_to?(:read)
|
||||
@temp_file.rewind
|
||||
buffer = ""
|
||||
while (buffer = @temp_file.read(8192))
|
||||
f.write(buffer)
|
||||
|
|
@ -56,16 +62,20 @@ class AvatarController < ApplicationController
|
|||
md5.update(@temp_file)
|
||||
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
|
||||
@temp_file = nil
|
||||
|
||||
image = Trustie::Utils::Image.new(diskfile,true)
|
||||
image.compress(300)
|
||||
|
||||
respond_to do |format|
|
||||
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
|
||||
}
|
||||
format.js
|
||||
|
|
|
|||
|
|
@ -67,9 +67,7 @@ class FilesController < ApplicationController
|
|||
end
|
||||
sort = "#{@sort} #{@order}"
|
||||
end
|
||||
|
||||
# show_attachments [@course]
|
||||
|
||||
begin
|
||||
q = "%#{params[:name].strip}%"
|
||||
#(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
|
||||
|
|
@ -108,14 +106,18 @@ class FilesController < ApplicationController
|
|||
end
|
||||
sort = "#{@sort} #{@order}"
|
||||
end
|
||||
|
||||
begin
|
||||
q = "%#{params[:name].strip}%"
|
||||
#(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
|
||||
if params[:insite]
|
||||
if q == "%%"
|
||||
@result = []
|
||||
@searched_attach = paginateHelper @result,10
|
||||
else
|
||||
@result = find_public_attache q,sort
|
||||
@result = visable_attachemnts_insite @result,@project
|
||||
@searched_attach = paginateHelper @result,10
|
||||
end
|
||||
else
|
||||
@result = find_project_attache q,@project,sort
|
||||
@result = visable_attachemnts @result
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ class IssuesController < ApplicationController
|
|||
attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
|
||||
redirect_to new_project_issue_url(@issue.project, :issue => attrs)
|
||||
else
|
||||
redirect_to issue_url(@issue)
|
||||
redirect_to issue_url(@issue.id)
|
||||
end
|
||||
}
|
||||
format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
|
||||
|
|
@ -239,7 +239,8 @@ class IssuesController < ApplicationController
|
|||
flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_back_or_default issue_path(@issue) }
|
||||
|
||||
format.html { redirect_to issue_url(@issue.id) }
|
||||
format.api { render_api_ok }
|
||||
end
|
||||
else
|
||||
|
|
|
|||
|
|
@ -247,9 +247,9 @@ class ProjectsController < ApplicationController
|
|||
# 1、自动注册
|
||||
# 2、加入项目、创建角色
|
||||
# 3、用户得分
|
||||
if params[:email]
|
||||
user = User.find_by_mail(params[:email].to_s)
|
||||
Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
|
||||
if params[:mail]
|
||||
Member.create(:role_ids => [4], :user_id => params[:user],:project_id => params[:id])
|
||||
UserGrade.create(:user_id =>params[:user], :project_id => params[:id])
|
||||
end
|
||||
if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
|
||||
return
|
||||
|
|
|
|||
|
|
@ -9,11 +9,15 @@ class ZipdownController < ApplicationController
|
|||
|
||||
#统一下载功能
|
||||
def download
|
||||
if User.current.logged?
|
||||
begin
|
||||
send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file])
|
||||
rescue => e
|
||||
render file: 'public/no_file_found.html'
|
||||
end
|
||||
else
|
||||
render_403
|
||||
end
|
||||
end
|
||||
|
||||
#一个作业下所有文件打包下载，只有admin和课程老师有权限
|
||||
|
|
|
|||
|
|
@ -47,6 +47,18 @@ module AccountHelper
|
|||
user
|
||||
end
|
||||
|
||||
# 自动创建一个新用户，但是初始状态是锁定的
|
||||
def automatically_register_lock(user, &block)
|
||||
user.lock
|
||||
user.last_login_on = Time.now
|
||||
if user.save
|
||||
UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
|
||||
else
|
||||
yield if block_given?
|
||||
end
|
||||
user
|
||||
end
|
||||
|
||||
def administrator_manually__register(user, &block)
|
||||
if user.save
|
||||
UserStatus.create(:user_id => user.id ,:changsets_count => 0, :watchers_count => 0)
|
||||
|
|
|
|||
|
|
@ -622,7 +622,7 @@ module ApplicationHelper
|
|||
# 公开项目资源可以引用，admin和管理员和资源上传者拥有设置公开私有权限
|
||||
def authority_pubilic_for_files(project, file)
|
||||
@result = false
|
||||
if (is_project_manager?(User.current.id, @project.id) || file.author_id == User.current.id || User.current.admin) &&
|
||||
if (is_project_manager?(User.current.id, @project.id) && User.current.allowed_to?(:manage_files, project)) || file.author_id == User.current.id || User.current.admin &&
|
||||
project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
|
||||
@result = true
|
||||
end
|
||||
|
|
|
|||
|
|
@ -65,6 +65,16 @@ module ProjectsHelper
|
|||
content_tag('div', content, :class => "tabs")
|
||||
end
|
||||
|
||||
# 判断我的项目中是否有重名项目
|
||||
def judge_same_projectname(user, project_name)
|
||||
result = false
|
||||
my_projects = user.projects
|
||||
my_projects.each do |mp|
|
||||
result = true if mp.name == project_name
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
# Added by young
|
||||
def course_settings_tabs
|
||||
tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ module QueriesHelper
|
|||
# Give it a name, required to be valid
|
||||
@query = IssueQuery.new(:name => "_")
|
||||
@query.project = @project
|
||||
params[:f] = %w(subject status_id priority_id author_id assigned_to_id) unless params[:status_id].nil?
|
||||
params[:f] = %w(subject status_id priority_id author_id assigned_to_id created_on) unless params[:status_id].nil?
|
||||
params[:op] = {'subject' => "~" ,
|
||||
'status_id' => ( params[:status_id] == '0' ? "!":"=" ),
|
||||
'priority_id' => ( params[:priority_id] == '0' ? "!":"=" ),
|
||||
|
|
@ -266,6 +266,22 @@ module QueriesHelper
|
|||
'priority_id' => [params[:priority_id]],
|
||||
'author_id' => [params[:author_id]],
|
||||
'assigned_to_id' => [params[:assigned_to_id]]} unless params[:status_id].nil?
|
||||
if(params[:status_id] != nil)
|
||||
if( params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='' &&
|
||||
params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='' )
|
||||
params[:op][:created_on]='><'
|
||||
params[:v][:created_on]=[params[:issue_create_date_start],params[:issue_create_date_end]]
|
||||
elsif(params[:issue_create_date_start]!=nil && params[:issue_create_date_start]!='')
|
||||
params[:op][:created_on]='>='
|
||||
params[:v][:created_on]=[params[:issue_create_date_start]]
|
||||
elsif(params[:issue_create_date_end]!=nil && params[:issue_create_date_end]!='')
|
||||
params[:op][:created_on]='<='
|
||||
params[:v][:created_on]=[params[:issue_create_date_end]]
|
||||
else
|
||||
params[:op][:created_on]='!'
|
||||
params[:v][:created_on]=''
|
||||
end
|
||||
end
|
||||
@query.build_from_params(params)
|
||||
#session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
|
||||
# else
|
||||
|
|
|
|||
|
|
@ -58,14 +58,10 @@ class Mailer < ActionMailer::Base
|
|||
us = UsersService.new
|
||||
# 自动激活用户
|
||||
user = us.register_auto(login, @email, @password)
|
||||
|
||||
Member.create(:role_ids => [4], :user_id => user.id,:project_id => project.id)
|
||||
UserGrade.create(:user_id => user.id, :project_id => project.id)
|
||||
User.current = user unless User.current.nil?
|
||||
@user = user
|
||||
@token = Token.get_token_from_user(user, 'autologin')
|
||||
@project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,:user => user, :token => @token.value
|
||||
)
|
||||
@project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
|
||||
mail :to => email, :subject => @subject
|
||||
end
|
||||
|
||||
|
|
@ -77,7 +73,7 @@ class Mailer < ActionMailer::Base
|
|||
@project_name = "#{project.name}"
|
||||
@user = user
|
||||
@token = Token.get_token_from_user(user, 'autologin')
|
||||
@project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :email => email, :token => @token.value)
|
||||
@project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
|
||||
mail :to => email, :subject => @subject
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ class Project < ActiveRecord::Base
|
|||
|
||||
validates_presence_of :name, :identifier
|
||||
validates_uniqueness_of :identifier
|
||||
validates_uniqueness_of :name
|
||||
# validates_uniqueness_of :name
|
||||
validates_associated :wiki#, :repository
|
||||
# validates_length_of :description, :maximum => 255
|
||||
validates_length_of :name, :maximum => 255
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class UsersService
|
|||
# 获取某个用户的所有留言信息
|
||||
def get_all_messages params
|
||||
user = User.find(params[:user_id])
|
||||
jours = user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
|
||||
jours = user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC').page(params[:page] || 1).per(10)
|
||||
jours.update_all(:is_readed => true, :status => false)
|
||||
jours.each do |journal|
|
||||
fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
|
||||
|
|
@ -166,13 +166,22 @@ class UsersService
|
|||
jours
|
||||
end
|
||||
|
||||
# 给某个用户留言
|
||||
def leave_messages params,current_user
|
||||
# 回复用户
|
||||
def reply_user_messages params,current_user
|
||||
user = User.find(params[:user_id])
|
||||
user.add_jour(current_user, params[:content], params[:refer_user_id] ||= 0)
|
||||
unless params[:refer_user_id].nil? || params[:refer_user_id] == 0 || params[:refer_user_id] == User.current.id
|
||||
User.find(params[:refer_user_id]).add_jour(current_user, params[:content], params[:refer_user_id])
|
||||
end
|
||||
parent_id = params[:parent_id]
|
||||
author_id = current_user.id
|
||||
reply_user_id = params[:ref_user_id]
|
||||
reply_id = params[:ref_message_id]
|
||||
content = params[:content]
|
||||
options = {:user_id => author_id,
|
||||
:status => true,
|
||||
:m_parent_id => parent_id,
|
||||
:m_reply_id => reply_id,
|
||||
:reply_id => reply_user_id,
|
||||
:notes => content,
|
||||
:is_readed => false}
|
||||
user.add_jour(nil, nil,nil,options)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
<label class="fl" > <%= l(:field_quote)%> ：</label>
|
||||
<!--<textarea name="bid[description]" placeholder="最多3000个汉字(或6000个英文字符)" class="hwork_text fl"></textarea>-->
|
||||
<% if edit_mode %>
|
||||
<%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID %>
|
||||
<%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0 %>
|
||||
<% else %>
|
||||
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
|
||||
<%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor' %>
|
||||
<%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0 %>
|
||||
<% end %>
|
||||
</li>
|
||||
<div class="cl"></div>
|
||||
|
|
|
|||
|
|
@ -46,9 +46,7 @@
|
|||
<%= text_field_tag 'name', params[:name], :size => 30, :onkeyup => 'regexName1();', :width => "125px" %>
|
||||
<%= hidden_field_tag 'project_type', params[:project_type] %>
|
||||
<%#= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
|
||||
<a href="#" onclick="submitSerch();" class="ButtonColor m3p10" style="padding-top: 7px !important;">
|
||||
<%= l(:label_search)%>
|
||||
</a>
|
||||
<%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
|
||||
<br />
|
||||
<span id="contest_name_span_head"></span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
</p>
|
||||
<p>
|
||||
<%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
|
||||
<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
|
||||
</p>
|
||||
<%= content_tag "div", course.short_description, :class => "brief_introduction",:style=>'float:left;', :title => course.short_description %>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
<% delete_allowed = User.current.allowed_to?(:manage_files, project) %>
|
||||
<div class="re_con_top">
|
||||
<p class="f_l c_blue f_b f_14">共有 <%= all_attachments.count%> 个资源</p>
|
||||
<p class="f_r" style="color: #808080">
|
||||
|
|
@ -22,14 +22,14 @@
|
|||
<% if User.current.logged? %>
|
||||
<% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
|
||||
<%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
|
||||
<% else %>
|
||||
<%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
|
||||
<% end %>
|
||||
<% if authority_pubilic_for_files(project, file) %>
|
||||
<% if authority_pubilic_for_files(project, file) && delete_allowed %>
|
||||
<span id="is_public_<%= file.id %>">
|
||||
<%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post %>
|
||||
</span>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,5 @@
|
|||
<%#= watcher_link_issue(@issue, User.current) %>
|
||||
<%#= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %>
|
||||
<%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
|
||||
|
||||
|
||||
<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
|
||||
<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project) %>
|
||||
<%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
|
||||
<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project) %>
|
||||
|
|
|
|||
|
|
@ -1,19 +1,32 @@
|
|||
<script>
|
||||
function remote_function() {
|
||||
$.ajax({
|
||||
url:'<%= project_issues_path(@project)%>',
|
||||
data:{
|
||||
subject:$("#v_subject").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
status_id: $("#status_id").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
assigned_to_id: $("#assigned_to_id option:selected").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
priority_id: $("#priority_id option:selected").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
author_id: $("#author_id option:selected").attr("value").replace(/(^\s*)|(\s*$)/g, "")
|
||||
},
|
||||
success: function(data){
|
||||
},
|
||||
error: function(data){
|
||||
}
|
||||
$(function(){
|
||||
$("input[nhname='date_show']").change(function(){
|
||||
if($(this).val()=='创建日期起始' || $(this).val()=='创建日期结束')return;
|
||||
$("input[nhname='date_val']",$(this).parent('div')).val($(this).val());
|
||||
remote_function();
|
||||
});
|
||||
});
|
||||
function remote_function() {
|
||||
$("#issue_query_form").submit();
|
||||
// $.ajax({
|
||||
// url:'<%#= project_issues_path(@project)%>',
|
||||
// data:{
|
||||
// subject:$("#v_subject").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
// status_id: $("#status_id").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
// assigned_to_id: $("#assigned_to_id option:selected").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
// priority_id: $("#priority_id option:selected").attr("value").replace(/(^\s*)|(\s*$)/g, ""),
|
||||
// author_id: $("#author_id option:selected").attr("value").replace(/(^\s*)|(\s*$)/g, "")
|
||||
// },
|
||||
// success: function(data){
|
||||
// },
|
||||
// error: function(data){
|
||||
// }
|
||||
// });
|
||||
}
|
||||
function nh_reset_form() {
|
||||
$("#issue_query_form")[0].reset();
|
||||
$("input[nhname='date_val']").val('');//涛哥的火狐reset 清不掉这个值 我擦
|
||||
remote_function();
|
||||
}
|
||||
|
||||
function EnterPress(e){
|
||||
|
|
@ -31,44 +44,62 @@
|
|||
</div>
|
||||
<div class="problem_top">
|
||||
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
|
||||
<%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
|
||||
<%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'true', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
|
||||
<%= hidden_field_tag 'set_filter', '1' %>
|
||||
<div class="problem_search" >
|
||||
<input class="problem_search_input fl" id="v_subject" type="text" name="v[subject]" value="<%= @subject ? @subject : ""%>" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
|
||||
<input class="problem_search_input fl" id="v_subject" type="text" name="subject" value="<%= @subject ? @subject : ""%>" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
|
||||
<a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
|
||||
<a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
|
||||
</div><!--problem_search end-->
|
||||
<%= link_to '新建问题', new_project_issue_path(@project) , :class => "green_u_btn fr ml10" %>
|
||||
<p class="problem_p fr" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
|
||||
<%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count %> </a>
|
||||
</p>
|
||||
|
||||
<div class="cl"></div>
|
||||
<div id="filter_form" class="fl">
|
||||
|
||||
<div id="filter_form" class="fr" >
|
||||
<%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
|
||||
{ :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
|
||||
},
|
||||
{:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"}
|
||||
{:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"w90"}
|
||||
)
|
||||
%>
|
||||
<%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
|
||||
{ :include_blank => false,:selected=>@priority_id ? @priority_id : 0
|
||||
},
|
||||
{:onchange=>"remote_function();",:id=>"priority_id",:name=>"v[priority_id]",:class=>"w90"}
|
||||
{:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"w90"}
|
||||
)
|
||||
%>
|
||||
<%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
|
||||
{ :include_blank => false,:selected=>@status_id ? @status_id : 0
|
||||
},
|
||||
{:onchange=>"remote_function();",:id=>"status_id",:name=>"v[status_id]",:class=>"w90"}
|
||||
{:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"w90"}
|
||||
)
|
||||
%>
|
||||
<%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
|
||||
{ :include_blank => false,:selected=>@author_id ? @author_id : 0
|
||||
},
|
||||
{:onchange=>"remote_function();",:id=>"author_id",:name=>"v[author_id]",:class=>"w90"}
|
||||
{:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"w90"}
|
||||
)
|
||||
%>
|
||||
</div><!--filter_form end-->
|
||||
<div>
|
||||
<div class="fl"> </div>
|
||||
<div>
|
||||
<input name="issue_create_date_start" nhname="date_val" type="hidden"/>
|
||||
<%= text_field_tag 'issue_create_date_start_show', '创建日期起始',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
|
||||
<%= calendar_for('issue_create_date_start_show') %>
|
||||
</div>
|
||||
<div style="float:left;"> - </div>
|
||||
<div>
|
||||
<input name="issue_create_date_end" nhname="date_val" type="hidden"/>
|
||||
<%= text_field_tag 'issue_create_date_end_show', '创建日期结束',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
|
||||
<%= calendar_for('issue_create_date_end_show') %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
<%# end %>
|
||||
<p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
|
||||
<%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count %> </a>
|
||||
</p>
|
||||
<% end %>
|
||||
|
||||
<div class="cl"></div>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
<div class="cl"></div>
|
||||
<p>由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>
|
||||
<% if @issue.created_on != @issue.updated_on %>
|
||||
更新于 <%= format_time(@issue.created_on).html_safe %>
|
||||
<% else %>
|
||||
添加于 <%= format_time(@issue.updated_on).html_safe %>
|
||||
<% end %>
|
||||
<%# if @issue.created_on != @issue.updated_on %>
|
||||
添加于 <%= format_time(@issue.created_on).html_safe %>
|
||||
<%# else %>
|
||||
<%#= format_time(@issue.updated_on).html_safe %>
|
||||
<%# end %>
|
||||
</div>
|
||||
<!--talk_txt end-->
|
||||
<a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@
|
|||
</td>
|
||||
<% end %>
|
||||
</tr>
|
||||
<% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation.empty? %>
|
||||
<% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation %>
|
||||
<tr>
|
||||
<td style=" float: right" width="70px">
|
||||
<span style="float: right"> <%= l(:field_occupation) %>：</span>
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@
|
|||
$('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
|
||||
$('#quote').val("<%= raw escape_javascript(@content) %>");
|
||||
showAndScrollTo("new_memo", "cke_editor01");
|
||||
$("img").removeAttr("align");
|
||||
|
|
@ -182,4 +182,5 @@
|
|||
}
|
||||
});
|
||||
};
|
||||
$("img").removeAttr("align");
|
||||
</script>
|
||||
|
|
@ -36,9 +36,9 @@
|
|||
<%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
|
||||
<br />
|
||||
<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 %>
|
||||
</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 %>">
|
||||
<%= l(:button_more)%>...
|
||||
<span class="g-arr-down"></span>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
<div class="project_r_h">
|
||||
<h2 class="project_h2"><%= l(:label_invite_join) %></h2>
|
||||
</div>
|
||||
|
|
@ -68,5 +67,37 @@
|
|||
var text=$(label).text();
|
||||
$(label).attr("title",text);
|
||||
}
|
||||
|
||||
function nh_show_err_message(msg){
|
||||
$("#RSide>.flash").remove();
|
||||
$("#RSide").prepend('<div class="flash error" id="flash_error">'+msg+'</div>');
|
||||
}
|
||||
$('#new_membership').submit(function(){
|
||||
var user_ischeck=false;
|
||||
$("input[name='membership[user_ids][]']").each(function(){
|
||||
if($(this).prop('checked')){
|
||||
user_ischeck=true;
|
||||
}
|
||||
});
|
||||
var role_ischeck=false;
|
||||
$("input[name='membership[role_ids][]']").each(function(){
|
||||
if($(this).prop('checked')){
|
||||
role_ischeck=true;
|
||||
}
|
||||
});
|
||||
if(user_ischeck==false && role_ischeck==false){
|
||||
nh_show_err_message('请选择用户和角色！');
|
||||
return false;
|
||||
}
|
||||
if(user_ischeck==false){
|
||||
nh_show_err_message('请选择用户！');
|
||||
return false;
|
||||
}
|
||||
if(role_ischeck==false){
|
||||
nh_show_err_message('请选择角色！');
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
@ -15,6 +15,11 @@
|
|||
<p style="padding-left: 180px;"><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
|
||||
|
||||
<p style="padding-left: 180px;"><%= setting_text_field :host_name, :size => 60 %>
|
||||
<p style="padding-left: 180px;"><%= setting_text_field :host_course, :size => 60 %>
|
||||
<p style="padding-left: 180px;"><%= setting_text_field :host_contest, :size => 60 %>
|
||||
<p style="padding-left: 180px;"><%= setting_text_field :host_user, :size => 60 %>
|
||||
<p style="padding-left: 180px;"><%= setting_text_field :host_repository, :size => 60 %>
|
||||
|
||||
<em class="info"><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
|
||||
|
||||
<p style="padding-left: 180px;"><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
|
||||
|
|
|
|||
|
|
@ -113,6 +113,7 @@ en:
|
|||
one: "1 error prohibited this %{model} from being saved"
|
||||
other: "%{count} errors prohibited this %{model} from being saved"
|
||||
messages:
|
||||
record_invalid: "validate error: %{errors}"
|
||||
inclusion: "is not included in the list"
|
||||
exclusion: "is reserved"
|
||||
invalid: "is invalid"
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ zh:
|
|||
one: "由于发生了一个错误 %{model} 无法保存"
|
||||
other: "%{count} 个错误使得 %{model} 无法保存"
|
||||
messages:
|
||||
record_invalid: "校验失败: %{errors}"
|
||||
inclusion: "不包含于列表中"
|
||||
exclusion: "是保留关键字"
|
||||
invalid: "是无效的"
|
||||
|
|
|
|||
|
|
@ -183,6 +183,10 @@ en:
|
|||
setting_bcc_recipients: Blind carbon copy recipients (bcc)
|
||||
setting_plain_text_mail: Plain text mail (no HTML)
|
||||
setting_host_name: Host name and path
|
||||
setting_host_course: Host course and path
|
||||
setting_host_contest: Host contest and path
|
||||
setting_host_user: Host user and path
|
||||
setting_host_repository: Host repository and path
|
||||
setting_text_formatting: Text formatting
|
||||
setting_wiki_compression: Wiki history compression
|
||||
setting_feeds_limit: Maximum number of items in Atom feeds
|
||||
|
|
@ -1521,4 +1525,5 @@ en:
|
|||
label_commit_failed: commit failed
|
||||
#api end
|
||||
error_upload_avatar_to_large: "too big (%{max_size})"
|
||||
not_valid_image_file: not a valid image file
|
||||
|
||||
|
|
|
|||
|
|
@ -190,6 +190,10 @@ zh:
|
|||
setting_bcc_recipients: 使用密件抄送 (bcc)
|
||||
setting_plain_text_mail: 纯文本（无HTML）
|
||||
setting_host_name: 主机名称
|
||||
setting_host_course: 课程域名
|
||||
setting_host_contest: 竞赛域名
|
||||
setting_host_user: 用户域名
|
||||
setting_host_repository: 仓库域名
|
||||
setting_text_formatting: 文本格式
|
||||
setting_wiki_compression: 压缩Wiki历史文档
|
||||
setting_feeds_limit: RSS Feed内容条数限制
|
||||
|
|
@ -1985,3 +1989,4 @@ zh:
|
|||
label_code: 代码
|
||||
|
||||
error_upload_avatar_to_large: "超过大小限制 (%{max_size})"
|
||||
not_valid_image_file: 不是有效的图片文件
|
||||
|
|
|
|||
17
db/schema.rb
17
db/schema.rb
|
|
@ -438,6 +438,13 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
|
|||
|
||||
add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
|
||||
|
||||
create_table "discuss_demos", :force => true do |t|
|
||||
t.string "title"
|
||||
t.text "body"
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
end
|
||||
|
||||
create_table "documents", :force => true do |t|
|
||||
t.integer "project_id", :default => 0, :null => false
|
||||
t.integer "category_id", :default => 0, :null => false
|
||||
|
|
@ -652,6 +659,16 @@ ActiveRecord::Schema.define(:version => 20150514133640) do
|
|||
|
||||
add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
|
||||
|
||||
create_table "journal_details_copy", :force => true do |t|
|
||||
t.integer "journal_id", :default => 0, :null => false
|
||||
t.string "property", :limit => 30, :default => "", :null => false
|
||||
t.string "prop_key", :limit => 30, :default => "", :null => false
|
||||
t.text "old_value"
|
||||
t.text "value"
|
||||
end
|
||||
|
||||
add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
|
||||
|
||||
create_table "journal_replies", :id => false, :force => true do |t|
|
||||
t.integer "journal_id"
|
||||
t.integer "user_id"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ module RailsKindeditor
|
|||
def kindeditor_tag(name, content = nil, options = {})
|
||||
id = sanitize_to_id(name)
|
||||
input_html = { :id => id }.merge(options.delete(:input_html) || {})
|
||||
input_html = input_html.merge(style: 'display:none')
|
||||
output = ActiveSupport::SafeBuffer.new
|
||||
output << text_area_tag(name, content, input_html)
|
||||
output << javascript_tag(js_replace(id, options.merge(window_onload: 'true')))
|
||||
|
|
@ -12,6 +13,7 @@ module RailsKindeditor
|
|||
def kindeditor(name, method, options = {})
|
||||
# TODO: Refactory options: 1. kindeditor_option 2. html_option
|
||||
input_html = (options.delete(:input_html) || {}).stringify_keys
|
||||
input_html = input_html.merge(style: 'display:none')
|
||||
output_buffer = ActiveSupport::SafeBuffer.new
|
||||
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')))
|
||||
|
|
|
|||
|
|
@ -3,11 +3,36 @@
|
|||
module Trustie
|
||||
module Utils
|
||||
class Image
|
||||
def initialize(file, bak)
|
||||
def initialize(file, bak=false)
|
||||
@file = file
|
||||
@bak = bak
|
||||
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,3]== 0xff.chr + 0xd8.chr + 0xff.chr
|
||||
end
|
||||
def png?(data)
|
||||
data[0,2]==0x89.chr + 80.chr
|
||||
end
|
||||
|
||||
def image?
|
||||
data = ''
|
||||
if @file.respond_to?(:read)
|
||||
data = @file.read(9)
|
||||
@file.rewind
|
||||
end
|
||||
return false if data.size < 9
|
||||
bitmap?(data) || gif?(data) || jpeg?(data) || png?(data)
|
||||
end
|
||||
|
||||
def compress(size=300)
|
||||
backup if @bak
|
||||
begin
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
//配置课程信息
|
||||
function course_setting(id)
|
||||
{
|
||||
function course_setting(id) {
|
||||
//alert(id);
|
||||
$('#tb_' + id).removeClass().addClass("hwork_hovertab");
|
||||
$('#tbc_0' + id).removeClass().addClass("dis");
|
||||
|
|
@ -17,28 +16,26 @@ $(function(){
|
|||
function add_group(url, course_id) {
|
||||
var group_name = $('#group_name').val();
|
||||
$.get(
|
||||
url,
|
||||
{ valid: "name",
|
||||
url, {
|
||||
valid: "name",
|
||||
value: group_name,
|
||||
course_id: course_id },
|
||||
course_id: course_id
|
||||
},
|
||||
function(data) {
|
||||
if (data.valid) {
|
||||
$("#add_group_name").submit();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
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();
|
||||
$.get(
|
||||
url,
|
||||
{
|
||||
url, {
|
||||
valid: "name",
|
||||
value: group_name,
|
||||
course_id: course_id,
|
||||
|
|
@ -47,104 +44,84 @@ function edit_group(id,url,course_id,group_id)
|
|||
function(data) {
|
||||
if (data.valid) {
|
||||
$("#update_group_" + group_id).submit();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
alert(data.message);
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function hidden_homework_score_form()
|
||||
{
|
||||
function hidden_homework_score_form() {
|
||||
hideModal($("#user_score"));
|
||||
}
|
||||
///////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////新建课程相关
|
||||
//验证课程名称
|
||||
function regex_course_name()
|
||||
{
|
||||
|
||||
function regex_course_name() {
|
||||
var name = $.trim($("#course_name").val());
|
||||
if(name.length == 0)
|
||||
{
|
||||
if (name.length == 0) {
|
||||
$("#course_name_notice").show();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#course_name_notice").hide();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
//验证课程学时
|
||||
function regex_course_class_period()
|
||||
{
|
||||
|
||||
function regex_course_class_period() {
|
||||
var class_period = $.trim($("#class_period").val());
|
||||
var regex = /^\d*$/;
|
||||
if(class_period.length == 0)
|
||||
{
|
||||
if (class_period.length == 0) {
|
||||
$("#course_class_period_notice").html("学时总数不能为空");
|
||||
$("#course_class_period_notice").show();
|
||||
return false;
|
||||
}
|
||||
else if (regex.test(class_period)) {
|
||||
if(parseInt(class_period) > 0)
|
||||
{
|
||||
} else if (regex.test(class_period)) {
|
||||
if (parseInt(class_period) > 0) {
|
||||
$("#course_class_period_notice").html("");
|
||||
$("#course_class_period_notice").hide();
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#course_class_period_notice").html("学时总数必须大于0");
|
||||
$("#course_class_period_notice").show();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#course_class_period_notice").html("学时总数必须为数字");
|
||||
$("#course_class_period_notice").show();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
//验证密码
|
||||
function regex_course_password()
|
||||
{
|
||||
|
||||
function regex_course_password() {
|
||||
var class_period = $.trim($("#course_course_password").val());
|
||||
var regex = /^\w+$/;
|
||||
if(class_period.length == 0)
|
||||
{
|
||||
if (class_period.length == 0) {
|
||||
$("#course_course_password_notice").html("课程密码不能为空");
|
||||
$("#course_course_password_notice").show();
|
||||
return false;
|
||||
}
|
||||
else if (regex.test(class_period)) {
|
||||
} else if (regex.test(class_period)) {
|
||||
$("#course_course_password_notice").html("");
|
||||
$("#course_course_password_notice").hide();
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#course_course_password_notice").html("课程密码有非法字符");
|
||||
$("#course_course_password_notice").show();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
//提交新建课程
|
||||
function submit_new_course()
|
||||
{
|
||||
if(regex_course_name()&®ex_course_class_period()&®ex_course_password())
|
||||
{
|
||||
|
||||
function submit_new_course() {
|
||||
if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
|
||||
$("#new_course").submit();
|
||||
}
|
||||
}
|
||||
|
||||
function submit_edit_course(id)
|
||||
{
|
||||
if(regex_course_name()&®ex_course_class_period()&®ex_course_password())
|
||||
{
|
||||
function submit_edit_course(id) {
|
||||
if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
|
||||
$("#edit_course_" + id).submit();
|
||||
}
|
||||
}
|
||||
|
|
@ -159,26 +136,23 @@ function regexSubject(id) {
|
|||
$(message).text("主题不能为空");
|
||||
$(message).css('color', '#ff0000');
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$(message).text("填写正确");
|
||||
$(message).css('color', '#008000');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
function regexContent(id) {
|
||||
|
||||
function regexContent(id) {
|
||||
var contentid = "#message_content" + id;
|
||||
var message = "#message_content_span" + id;
|
||||
var content = $.trim($(contentid).val());
|
||||
|
||||
if (content.length == 0) {
|
||||
$(message).text("描述不能为空");
|
||||
$(message).css('color', '#ff0000');
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$(message).text("填写正确");
|
||||
$(message).css('color', '#008000');
|
||||
return true;
|
||||
|
|
@ -197,24 +171,18 @@ function submitProjectsBoard(id) {
|
|||
|
||||
///////////////////////////////////////////////////////////////
|
||||
/////////////////////////////////////////////////////////////// 课程通知
|
||||
function regexTitle()
|
||||
{
|
||||
function regexTitle() {
|
||||
var name = $("#news_title").val();
|
||||
if(name.length ==0)
|
||||
{
|
||||
if (name.length == 0) {
|
||||
$("#title_notice_span").text("标题不能为空");
|
||||
$("#title_notice_span").css('color', '#ff0000');
|
||||
$("#news_title").focus();
|
||||
return false;
|
||||
}
|
||||
else if(name.length <= 60)
|
||||
{
|
||||
} else if (name.length <= 60) {
|
||||
$("#title_notice_span").text("填写正确");
|
||||
$("#title_notice_span").css('color', '#008000');
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#title_notice_span").text("标题超过60个字符");
|
||||
$("#title_notice_span").css('color', '#ff0000');
|
||||
$("#news_title").focus();
|
||||
|
|
@ -222,62 +190,50 @@ function regexTitle()
|
|||
}
|
||||
}
|
||||
|
||||
function regexDescription()
|
||||
{
|
||||
function regexDescription() {
|
||||
var name = news_description_editor.html();
|
||||
if(name.length ==0)
|
||||
{
|
||||
if (name.length == 0) {
|
||||
$("#description_notice_span").text("描述不能为空");
|
||||
$("#description_notice_span").css('color', '#ff0000');
|
||||
$("#description_notice_span").focus();
|
||||
return false;
|
||||
}
|
||||
else if(name.length >=6000){
|
||||
} else if (name.length >= 6000) {
|
||||
$("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)");
|
||||
$("#description_notice_span").css('color', '#ff0000');
|
||||
$("#description_notice_span").focus();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#description_notice_span").text("填写正确");
|
||||
$("#description_notice_span").css('color', '#008000');
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
function submitNews()
|
||||
{
|
||||
if(regexTitle() && regexDescription())
|
||||
{
|
||||
function submitNews() {
|
||||
if (regexTitle() && regexDescription()) {
|
||||
news_description_editor.sync();
|
||||
$("#news-form").submit();
|
||||
}
|
||||
}
|
||||
|
||||
function submitFocus(obj)
|
||||
{
|
||||
function submitFocus(obj) {
|
||||
$(obj).focus();
|
||||
}
|
||||
|
||||
function submitComment()
|
||||
{
|
||||
function submitComment() {
|
||||
comment_editor.sync();
|
||||
$("#add_comment_form").submit();
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////课程讨论区
|
||||
function course_board_submit_message_replay()
|
||||
{
|
||||
if(MessageReplayVevify())
|
||||
{
|
||||
function course_board_submit_message_replay() {
|
||||
if (MessageReplayVevify()) {
|
||||
message_content_editor.sync(); //提交内容之前要sync，不然服务器端取不到值
|
||||
$("#message_form").submit();
|
||||
}
|
||||
}
|
||||
|
||||
function course_board_canel_message_replay()
|
||||
{
|
||||
function course_board_canel_message_replay() {
|
||||
$("#reply").hide(200);
|
||||
$("#message_quote").html("");
|
||||
}
|
||||
|
|
@ -288,8 +244,7 @@ function MessageReplayVevify() {
|
|||
$("#message_content_span").text("回复不能为空");
|
||||
$("#message_content_span").css('color', '#ff0000');
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$("#message_content_span").text("填写正确");
|
||||
$("#message_content_span").css('color', '#008000');
|
||||
return true;
|
||||
|
|
@ -300,70 +255,62 @@ function MessageReplayVevify() {
|
|||
///////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////
|
||||
//验证搜索时输入名字
|
||||
function regexName(content)
|
||||
{
|
||||
function regexName(content) {
|
||||
var name = $.trim($("#name").val());
|
||||
if(name.length == 0)
|
||||
{
|
||||
if (name.length == 0) {
|
||||
$("#project_name_span").text(content);
|
||||
$("#project_name_span").css('color', '#ff0000');
|
||||
$("#project_name_span").focus();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#project_name_span").text("");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
//提交搜索
|
||||
function submitSerch(content)
|
||||
{
|
||||
if(regexName(content)){$("#course_search_form").submit();}
|
||||
|
||||
function submitSerch(content) {
|
||||
if (regexName(content)) {
|
||||
$("#course_search_form").submit();
|
||||
}
|
||||
}
|
||||
|
||||
//验证搜索时输入名字
|
||||
function regexQ(content)
|
||||
{
|
||||
function regexQ(content) {
|
||||
var name = $.trim($("#q").val());
|
||||
if(name.length == 0)
|
||||
{
|
||||
if (name.length == 0) {
|
||||
$("#course_member_name_span").text(content);
|
||||
$("#course_member_name_span").css('color', '#ff0000');
|
||||
$("#course_member_name_span").focus();
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#course_member_name_span").text("");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
//提交课程成员搜索
|
||||
function submitMemberSerch(content)
|
||||
{
|
||||
|
||||
function submitMemberSerch(content) {
|
||||
//if(regexQ(content)){$("#course_member_search_form").submit();}
|
||||
$("#course_member_search_form").submit();
|
||||
}
|
||||
|
||||
//课程描述显示更多信息
|
||||
function show_more_msg()
|
||||
{
|
||||
function show_more_msg() {
|
||||
$("#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");
|
||||
}
|
||||
function bid_show_more_des(id)
|
||||
{
|
||||
|
||||
function bid_show_more_des(id) {
|
||||
$("#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 endDate = new Date(year, month - 1, day);
|
||||
var leftTime = endDate.getTime() - now.getTime();
|
||||
|
|
@ -372,64 +319,43 @@ function show_bid_dead_line(year,month,day,divname)
|
|||
var hour = Math.floor((leftsecond - day1 * 24 * 60 * 60) / 3600);
|
||||
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);
|
||||
$("#"+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>");
|
||||
$("#" + 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>");
|
||||
}
|
||||
//验证新建作业的名字
|
||||
function regex_bid_name()
|
||||
{
|
||||
|
||||
function regex_bid_name() {
|
||||
var name = $.trim($("#bid_name").val());
|
||||
|
||||
if(name=="")
|
||||
{
|
||||
if (name == "") {
|
||||
$("#bid_name_span").text("名称不能为空");
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#bid_name_span").text("");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
//验证匿评数量
|
||||
function regex_evaluation_num()
|
||||
{
|
||||
function regex_evaluation_num() {
|
||||
var evaluation_num = $.trim($("#bid_evaluation_num").val());
|
||||
var regex = /^\d+$/;
|
||||
if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
|
||||
{
|
||||
if(evaluation_num=="")
|
||||
{
|
||||
if ($("#bid_open_anonymous_evaluation").attr("checked") == "checked") {
|
||||
if (evaluation_num == "") {
|
||||
$("#bid_evaluation_num_span").text("匿评分配数量不能为空");
|
||||
return false;
|
||||
}
|
||||
else if(regex.test(evaluation_num))
|
||||
{
|
||||
if(evaluation_num > 0)
|
||||
{
|
||||
} else if (regex.test(evaluation_num)) {
|
||||
if (evaluation_num > 0) {
|
||||
$("#bid_evaluation_num_span").text("");
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -437,22 +363,17 @@ function regex_evaluation_num()
|
|||
//点击是否开启匿评单选框效果
|
||||
$(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();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
$("#bid_evaluation_num_li").slideUp();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//老师提交新建作业
|
||||
function submit_new_bid(id)
|
||||
{
|
||||
if(regex_bid_name()&®ex_evaluation_num())
|
||||
{
|
||||
function submit_new_bid(id) {
|
||||
if (regex_bid_name() && regex_evaluation_num()) {
|
||||
bid_description_editor.sync();
|
||||
$("#" + id).submit();
|
||||
}
|
||||
|
|
@ -471,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"));
|
||||
}
|
||||
|
||||
//当课程描述长度小于112px时，不显示更多按钮
|
||||
$(function() {
|
||||
if($("#course_description_content").height()>112)
|
||||
{
|
||||
if ($("#course_description_content").height() > 112) {
|
||||
$("#lg-foot").show();
|
||||
}
|
||||
});
|
||||
|
|
@ -498,15 +417,13 @@ $(document).ready(function () {
|
|||
};
|
||||
if (browser.mozilla || browser.opera) {
|
||||
$("pre").addClass("break_word_firefox");
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
$("pre").addClass("break_word");
|
||||
}
|
||||
});
|
||||
|
||||
// 日历选择日期后关闭
|
||||
function regexDeadLine()
|
||||
{
|
||||
function regexDeadLine() {
|
||||
('#ui-datepicker-div').hide;
|
||||
}
|
||||
|
||||
|
|
@ -520,21 +437,28 @@ $(function(){
|
|||
//课程通知更多按钮显示
|
||||
$(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_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资源
|
||||
function search_tag_attachment(url,tag_name,q,course_id,sort)
|
||||
{
|
||||
function search_tag_attachment(url, tag_name, q, course_id, sort) {
|
||||
//alert("111");
|
||||
$.get(
|
||||
url,
|
||||
{
|
||||
url, {
|
||||
tag_name: tag_name,
|
||||
q: q,
|
||||
course_id: course_id
|
||||
|
|
@ -550,8 +474,7 @@ function showhelpAndScrollToMessage(id, id1, count) {
|
|||
$('#' + id).toggle();
|
||||
if (cookieget("repositories_visiable") == "true") {
|
||||
cookiesave("repositories_visiable", false, '', '', '');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
cookiesave("repositories_visiable", true, '', '', '');
|
||||
}
|
||||
var information = $(id1);
|
||||
|
|
@ -559,14 +482,12 @@ function showhelpAndScrollToMessage(id, id1, count) {
|
|||
if (val == "show_help") {
|
||||
$(id1).text("收起回复(" + count + ")");
|
||||
information.attr("value", "hide_help");
|
||||
information.attr("style", "color:#3ca5c6");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$(id1).text("展开回复(" + count + ")");
|
||||
information.attr("value", "show_help");
|
||||
information.attr("style", "color:#0781b4;");
|
||||
}
|
||||
}
|
||||
|
||||
function show_more_reply(contentid, id2, id3) {
|
||||
$(contentid).toggleClass("course_description_none");
|
||||
var information = $(id2);
|
||||
|
|
@ -575,13 +496,10 @@ function showhelpAndScrollToMessage(id, id1, count) {
|
|||
if (val == "show_more") {
|
||||
$(id2).text("[收起]");
|
||||
information.attr("value", "hide_more");
|
||||
information.attr("style", "color:#3ca5c6");
|
||||
arrow.attr("src", "/images/jiantouup.jpg")
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$(id2).text("[展开]");
|
||||
information.attr("value", "show_more");
|
||||
arrow.attr("src", "/images/jiantou.jpg")
|
||||
information.attr("style", "color:#0781b4;");
|
||||
}
|
||||
}
|
||||
|
|
@ -44,9 +44,18 @@ $(function() {
|
|||
},
|
||||
done: function(e, data) {
|
||||
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({
|
||||
"src": data.result.text ? data.result.text() : data.result
|
||||
"src": o.url
|
||||
});
|
||||
} else {
|
||||
alert(o.message);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -454,3 +454,34 @@ $(function(){
|
|||
personalized_init();
|
||||
});
|
||||
//cookie记忆html区块 显示/隐藏 的代码 end
|
||||
|
||||
// 新建项目的时候判断是否与我已有的项目重复
|
||||
function judgeprojectname(){
|
||||
$('#new_project').validate({
|
||||
errorPlacement: function(error, element){
|
||||
alert('error')
|
||||
},
|
||||
success: function(label){
|
||||
alert('ok')
|
||||
},
|
||||
onkeyup: false,
|
||||
rules : {
|
||||
name:{required : true,
|
||||
remote : {
|
||||
url : 'projects/judge_same_projectname',
|
||||
type:'get',
|
||||
dataType:'text',
|
||||
data:{
|
||||
name : function(){ return $.trim( $("#name").val() ); }
|
||||
},
|
||||
dataFilter:function( data ){
|
||||
if( data=='true')return false; else return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
messages : {
|
||||
name:{required : "请填写项目名称！",remote:'您已新建过同名项目，请修改项目名称！'}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2794,3 +2794,4 @@ div.repos_explain{
|
|||
padding-bottom: 20px;
|
||||
}
|
||||
.upload_img img{max-width: 100%;}
|
||||
#activity .upload_img img{width: 580px;}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -6,4 +6,12 @@ FactoryGirl.define do
|
|||
password "foobar111"
|
||||
password_confirmation "foobar111"
|
||||
end
|
||||
|
||||
factory :student, class: User do
|
||||
login "student"
|
||||
mail "student@example.com"
|
||||
password "foobar111"
|
||||
password_confirmation "foobar111"
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe ForumObserver do
|
||||
pending "add some examples to (or delete) #{__FILE__}"
|
||||
end
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe MemoObserver do
|
||||
pending "add some examples to (or delete) #{__FILE__}"
|
||||
end
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
require 'rails_helper'
|
||||
|
||||
RSpec.describe "avatar request", type: :request do
|
||||
describe "上传头像" do
|
||||
let(:user){FactoryGirl.create(:user)}
|
||||
|
||||
it "参数正确，可以成功上传头像" do
|
||||
data = File.open("#{Rails.root}/spec/fixtures/test.jpg").read
|
||||
binding.pry
|
||||
post upload_avatar_path(source_type: 'User', source_id: user.id, filename: 'test.jpg')
|
||||
expect(response).to have_http_status(:success)
|
||||
expect(response.body).to include(/\/images\/avatars\/User\//)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -35,13 +35,53 @@ RSpec.describe "课程", :type => :request do
|
|||
context "修改课程图片" do
|
||||
include Rack::Test::Methods
|
||||
let(:avatar) {Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/test.jpg",'image/jpg')}
|
||||
|
||||
context "正常图片上传成功" do
|
||||
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.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
|
||||
|
||||
it "不是图片，上传失败"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,40 @@
|
|||
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
|
||||
let(:student){FactoryGirl.create(:student)}
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue