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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

Browse Source
linchun
cxt 9 years ago
parent d9bd13c2fc 72ae31b7f9
commit 09b831c189
10 changed files with 139 additions and 169 deletions
Show Stats Download Patch File Download Diff File

195
app/controllers/users_controller.rb
Unescape View File

@ -1095,22 +1095,27 @@ class UsersController < ApplicationController
#引入资源列表根据关键词过滤 #引入资源列表根据关键词过滤
def user_ref_resource_search def user_ref_resource_search
search = params[:search].to_s.strip.downcase if User.current.id.to_i != params[:id].to_i
if(params[:type].blank? || params[:type] == "1") #全部 render_403
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询 return
@attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ end
" or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc") @resource_id = params[:mul_id]
elsif params[:type] == "2" #课程资源 @resource_type = params[:mul_type]
@order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
@score = @b_sort == "desc" ? "asc" : "desc"
@user = User.current
@switch_search = params[:search].nil? ? " " : params[:search]
search = "%#{@switch_search.strip.downcase}%"
# 别人的资源库是没有权限去看的
if(params[:type] == "1") # 我的资源
# 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
@attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc") user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
elsif params[:type] == "3" #项目资源 # user_org_ids = User.current.organizations.map {|o| o.id}
@attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project' and (filename like '%#{search}%')").order("created_on desc") @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
elsif params[:type] == "4" #附件 elsif (params[:type].blank? || params[:type] == "6") # 公共资源
@attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon') and (filename like '%#{search}%')").order("created_on desc") # 公共资源库：所有公开资源或者我上传的私有资源
elsif params[:type] == "5" #用户资源 @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
@attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
elsif params[:type] == "6" #公共资源
@attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
end end
@type = params[:type] @type = params[:type]
@limit = 7 @limit = 7
@ -2058,18 +2063,18 @@ class UsersController < ApplicationController
# 公共资源库：所有公开资源或者我上传的私有资源 # 公共资源库：所有公开资源或者我上传的私有资源
@attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score) @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
end end
elsif params[:type] == "2" # elsif params[:type] == "2"
apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id} # apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
if params[:status] == "2" # if params[:status] == "2"
resource_type = "'Course'" # resource_type = "'Course'"
elsif params[:status] == "3" # elsif params[:status] == "3"
resource_type = "'Project'" # resource_type = "'Project'"
elsif params[:status] == "5" # elsif params[:status] == "5"
resource_type = "'Principal'" # resource_type = "'Principal'"
else # else
resource_type = "'Project','OrgSubfield','Principal','Course'" # resource_type = "'Project','OrgSubfield','Principal','Course'"
end # end
@attachments = get_my_private_resources(apply_ids, resource_type, @order, @score) # @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
end end
@type = params[:type] @type = params[:type]
@limit = 25 @limit = 25
@ -2211,18 +2216,18 @@ class UsersController < ApplicationController
# 公共资源库：所有公开资源或者我上传的私有资源 # 公共资源库：所有公开资源或者我上传的私有资源
@attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score) @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
end end
elsif params[:type] == "2" # elsif params[:type] == "2"
apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id} # apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
if params[:status] == "2" # if params[:status] == "2"
resource_type = "'Course'" # resource_type = "'Course'"
elsif params[:status] == "3" # elsif params[:status] == "3"
resource_type = "'Project'" # resource_type = "'Project'"
elsif params[:status] == "5" # elsif params[:status] == "5"
resource_type = "'Principal'" # resource_type = "'Principal'"
else # else
resource_type = "'Project','OrgSubfield','Principal','Course'" # resource_type = "'Project','OrgSubfield','Principal','Course'"
end # end
@attachments = get_my_private_resources(apply_ids, resource_type, @order, @score) # @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
end end
@status = params[:status] @status = params[:status]
@type = params[:type] @type = params[:type]
@ -2352,18 +2357,18 @@ class UsersController < ApplicationController
# 公共资源库：所有公开资源或者我上传的私有资源 # 公共资源库：所有公开资源或者我上传的私有资源
@attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score) @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
end end
elsif params[:type] == "2" # elsif params[:type] == "2"
apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id} # apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
if params[:status] == "2" # if params[:status] == "2"
resource_type = "'Course'" # resource_type = "'Course'"
elsif params[:status] == "3" # elsif params[:status] == "3"
resource_type = "'Project'" # resource_type = "'Project'"
elsif params[:status] == "5" # elsif params[:status] == "5"
resource_type = "'Principal'" # resource_type = "'Principal'"
else # else
resource_type = "'Project','OrgSubfield','Principal','Course'" # resource_type = "'Project','OrgSubfield','Principal','Course'"
end # end
@attachments = get_my_private_resources(apply_ids, resource_type, @order, @score) # @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
end end
@type = params[:type] @type = params[:type]
@limit = 25 @limit = 25
@ -2700,12 +2705,12 @@ class UsersController < ApplicationController
# 获取公共资源 # 获取公共资源
def get_public_resources user_course_ids, user_project_ids, order, score def get_public_resources user_course_ids, user_project_ids, order, score
attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}") attachments = Attachment.where("(is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取公共资源搜索 # 获取公共资源搜索
def get_public_resources_search user_course_ids, user_project_ids, order, score, search def get_public_resources_search user_course_ids, user_project_ids, order, score, search
attachments = Attachment.where("is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}") attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取我的资源 # 获取我的资源
@ -2729,15 +2734,15 @@ class UsersController < ApplicationController
and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}") and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取我的私有资源分享结果 # # 获取我的私有资源分享结果
def get_my_private_resources apply_ids, resource_type, order, score # def get_my_private_resources apply_ids, resource_type, order, score
attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}") # attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
end # end
#
# 获取我的私有资源分享搜索结果 # # 获取我的私有资源分享搜索结果
def get_my_private_resources_search apply_ids, resource_type, order, score, search # def get_my_private_resources_search apply_ids, resource_type, order, score, search
attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}") # attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
end # end
# 获取我的课程资源中搜索结果 # 获取我的课程资源中搜索结果
def get_course_resources_search author_id, user_course_ids, order, score, search def get_course_resources_search author_id, user_course_ids, order, score, search
@ -2748,12 +2753,12 @@ class UsersController < ApplicationController
# 获取公共资源中课程资源 # 获取公共资源中课程资源
def get_course_resources_public user_course_ids, order, score def get_course_resources_public user_course_ids, order, score
attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1)").order("#{order.nil? ? 'created_on' : order} #{score}") attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取公共资源中课程资源搜索结果 # 获取公共资源中课程资源搜索结果
def get_course_resources_public_search user_course_ids, order, score, search def get_course_resources_public_search user_course_ids, order, score, search
attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}") attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取我的项目资源 # 获取我的项目资源
@ -2772,12 +2777,12 @@ class UsersController < ApplicationController
# 获取公共资源的项目资源 # 获取公共资源的项目资源
def get_project_resources_public user_project_ids, order, score def get_project_resources_public user_project_ids, order, score
attchments = Attachment.where("container_type = 'Project' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}") attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取公共资源的项目资源搜索 # 获取公共资源的项目资源搜索
def get_project_resources_public_search user_project_ids, order, score, search def get_project_resources_public_search user_project_ids, order, score, search
attchments = Attachment.where("(container_type = 'Project' and container_id is not null) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}") attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取我上传的附件 # 获取我上传的附件
@ -2795,13 +2800,13 @@ class UsersController < ApplicationController
# 获取公共资源中我上传的附件 # 获取公共资源中我上传的附件
def get_attch_resources_public order, score def get_attch_resources_public order, score
attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}") and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取公共资源中我上传的附件 # 获取公共资源中我上传的附件
def get_attch_resources_public_search order, score, search def get_attch_resources_public_search order, score, search
attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}") and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取我的用户类型资源 # 获取我的用户类型资源
@ -2816,12 +2821,12 @@ class UsersController < ApplicationController
# 获取我的用户类型资源 # 获取我的用户类型资源
def get_principal_resources_public order, score def get_principal_resources_public order, score
attchments = Attachment.where("container_type = 'Principal' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}") attchments = Attachment.where("container_type = 'Principal' and is_public =1 and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 获取我的用户类型资源 # 获取我的用户类型资源
def get_principal_resources_public_search order, score, search def get_principal_resources_public_search order, score, search
attchments = Attachment.where("(container_type = 'Principal'and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}") attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
end end
# 资源库 分为全部 课程资源 项目资源 附件 # 资源库 分为全部 课程资源 项目资源 附件
@ -2863,18 +2868,18 @@ class UsersController < ApplicationController
# 公共资源库：所有公开资源或者我上传的私有资源 # 公共资源库：所有公开资源或者我上传的私有资源
@attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score) @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
end end
elsif params[:type] == "2" # 私有资源 # elsif params[:type] == "2" # 私有资源
apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id} # apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
if params[:status] == "2" # if params[:status] == "2"
resource_type = "'Course'" # resource_type = "'Course'"
elsif params[:status] == "3" # elsif params[:status] == "3"
resource_type = "'Project'" # resource_type = "'Project'"
elsif params[:status] == "5" # elsif params[:status] == "5"
resource_type = "'Principal'" # resource_type = "'Principal'"
else # else
resource_type = "'Project','OrgSubfield','Principal','Course'" # resource_type = "'Project','OrgSubfield','Principal','Course'"
end # end
@attachments = get_my_private_resources(apply_ids, resource_type, @order, @score) # @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
end end
@status = params[:status] @status = params[:status]
@type = params[:type] @type = params[:type]
@ -3054,19 +3059,19 @@ class UsersController < ApplicationController
# 公共资源库：所有公开资源或者我上传的私有资源 # 公共资源库：所有公开资源或者我上传的私有资源
@attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search) @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
end end
elsif params[:type] == "2" # 私有资源 # elsif params[:type] == "2" # 私有资源
apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id} # apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
if params[:status] == "2" # if params[:status] == "2"
resource_type = "'Course'" # resource_type = "'Course'"
elsif params[:status] == "3" # elsif params[:status] == "3"
resource_type = "'Project'" # resource_type = "'Project'"
elsif params[:status] == "5" # elsif params[:status] == "5"
resource_type = "'Principal'" # resource_type = "'Principal'"
else # else
resource_type = "'Project','OrgSubfield','Principal','Course'" # resource_type = "'Project','OrgSubfield','Principal','Course'"
end # end
@attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search) # @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
@attachments # @attachments
end end
@status = params[:status] @status = params[:status]
@type = params[:type] @type = params[:type]

47
app/views/users/_resources_list.html.erb
Unescape View File

@ -6,55 +6,20 @@
<% attachments.each do |attach| %> <% attachments.each do |attach| %>
<ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')"> <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
<li class="resource-list-checkbox fl"> <li class="resource-list-checkbox fl">
<% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %> <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N' %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
<input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N' %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
<% else %>
<input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N' %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
<% end %>
<!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />--> <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
</li> </li>
<li class="resource-list-name fl"> <li class="resource-list-name fl">
<% if private_attachment_allow(attach.id) %> <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
<a style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
<% else %>
<%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
<% end %>
<% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
<img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
<% end %>
</li>
<li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
<% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
<% ah = attach.get_status_by_attach(User.current.id) %>
<% if ah.nil? %>
<%= link_to("请求分享", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %>
<% elsif ah == 1 %>
等待回复
<% elsif ah == 2 %>
可引用
<% elsif ah == 3 %>
已拒绝
<% end %>
<% else %>
<% ah = attach.get_status_by_attach(User.current.id) %>
<% if ah == 2 %>
可引用
<% else %>
--
<% end %>
<% end %>
</li> </li>
<li class="resource-list-time fr"><%= format_date(attach.created_on) %></li> <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
<li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li> <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
<li class="resource-list-download fr"><%= attach.downloads %></li> <li class="resource-list-download fr"><%= attach.downloads %></li>
<li style="display: none"><%= attach.author_id %></li> <li style="display: none"><%= attach.author_id %></li>
<li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li> <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
<li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li> <li class="resource-list-uploader fr hidden"><%= User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
<li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li> <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
<li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li> <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
<li style="display: none"><%= private_attachment_allow(attach.id) %></li>
<li style="display: none"><%= attach.get_apply_resource_status(attach.id, User.current.id) %></li>
<li style="display: none"><%= private_attachment_allow(attach.id) ? 0 : 1 %></li>
<li style="display: none"><%= attach.id %></li> <li style="display: none"><%= attach.id %></li>
</ul> </ul>
<div class="cl"></div> <div class="cl"></div>
@ -104,7 +69,7 @@
document.oncontextmenu = function() {return true;} document.oncontextmenu = function() {return true;}
line.children().css("background-color",'white'); line.children().css("background-color",'white');
id = line.children().last().html(); id = line.children().last().html();
user_id = line.children().eq(6).html(); user_id = line.children().eq(5).html();
allow = line.children().eq(13).html(); allow = line.children().eq(13).html();
if( allow == 0){ if( allow == 0){
alert('您无权发送私有资源') alert('您无权发送私有资源')
@ -219,7 +184,7 @@
} }
line.children().css("background-color", 'white'); line.children().css("background-color", 'white');
id = line.children().last().html(); id = line.children().last().html();
user_id = line.children().eq(6).html(); user_id = line.children().eq(5).html();
if(user_id === '<%= User.current.id%>') { if(user_id === '<%= User.current.id%>') {
if(line.children().first().children().data('hasHistory') == 'Y'){ if(line.children().first().children().data('hasHistory') == 'Y'){
alert('该资源存在历史版本，不能删除'); alert('该资源存在历史版本，不能删除');
@ -228,7 +193,7 @@
if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) { if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>' url: '<%= user_resource_delete_user_path(User.current.id) %>' + '?resource_id=' + id + '&type=<%= @type %>&status=<%= @status %>'
}); });
} }

15
app/views/users/_show_user_resource.html.erb
Unescape View File

@ -10,11 +10,16 @@
// }); // });
$(document).ready(function(){ $(document).ready(function(){
<% if type == "1" %>
$("#my_resources_choose_homework").addClass("referenceTypeActive");
$("#public_resources_choose_homework").removeClass("referenceTypeActive");
<% else %>
$(".referenceTypeBlock").click(function(){ $(".referenceTypeBlock").click(function(){
var activeBlock = $(".referenceResourceType").children(".referenceTypeActive"); var activeBlock = $(".referenceResourceType").children(".referenceTypeActive");
activeBlock.removeClass("referenceTypeActive"); activeBlock.removeClass("referenceTypeActive");
$(this).addClass("referenceTypeActive"); $(this).addClass("referenceTypeActive");
}); });
<% end %>
}); });
// 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去 // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
@ -36,14 +41,12 @@ function store_seleted_resource(dom){
</div> </div>
<div> <div>
<div class="referenceResourceType fl"> <div class="referenceResourceType fl">
<a href="<%= user_resource_type_user_path(user)%>" class="referenceTypeBlock referenceTypeActive" data-remote="true" >资源库</a> <a href="<%= user_ref_resource_search_user_path(User.current, :type => '6') %>" id="public_resources_choose_homework" class="referenceTypeBlock referenceTypeActive" data-remote="true">公共资源</a>
<a href="<%= user_resource_type_user_path(user,:type=>'2')%>" class="referenceTypeBlock" data-remote="true">课程资源</a> <a href="<%= user_ref_resource_search_user_path(User.current, :type => '1') %>" id="my_resources_choose_homework" class="referenceTypeBlock" data-remote="true">我的资源</a>
<a href="<%= user_resource_type_user_path(user,:type=>'3')%>" class="referenceTypeBlock" data-remote="true">项目资源</a> </div>
<a href="<%= user_resource_type_user_path(user,:type=>'5')%>" class="referenceTypeBlock" data-remote="true">用户资源</a>
<a href="<%= user_resource_type_user_path(user,:type=>'4')%>" class="referenceTypeBlock" data-remote="true">附件</a> </div>
<div class="fr"> <div class="fr">
<!--<form class="referenceSearchBox">--> <!--<form class="referenceSearchBox">-->
<%= form_tag(user_ref_resource_search_user_path(user),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%> <%= form_tag(user_ref_resource_search_user_path(user, :type => @type),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
<input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchReferencePopup" /> <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchReferencePopup" />
<a href="javascript:void(0);" onclick="$(this).parent().submit();" class="referenceSearchIcon"></a> <a href="javascript:void(0);" onclick="$(this).parent().submit();" class="referenceSearchIcon"></a>
<% end %> <% end %>

2
app/views/users/_user_homework_attachment.html.erb
Unescape View File

@ -70,7 +70,7 @@
<div class="mt5 fl"> <div class="mt5 fl">
<!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) --> <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
<a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a> <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
<%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr15",:title=>"请从资源库中选择文件作为作品的附件",:remote => true%> <%= link_to "资源库", user_ref_resource_search_user_path(User.current.id, :homework_id => container.id), :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
<% if defined?(has_program) && has_program %> <% if defined?(has_program) && has_program %>
<div id="program_setting" class="fl"> <div id="program_setting" class="fl">
<a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a> <a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a>

16
app/views/users/_user_import_resource_list.html.erb
Unescape View File

@ -6,22 +6,10 @@
<ul class="subjectRow"> <ul class="subjectRow">
<li class="subjectName fl hidden"> <li class="subjectName fl hidden">
<label> <label>
<% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %> <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N' %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
<input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N' %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
<% else %>
<input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N' %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
<% end %>
<span> <span>
<% if private_attachment_allow(attach.id) %> <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
<a style="cursor: default" title="<%= attach.filename %>"><%= attach.filename %> </a>
<% else %>
<%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
<% end %>
</span> </span>
<% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
<img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
<% end %>
</label> </label>
</li> </li>
<li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li> <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>

10
app/views/users/_user_resource_info.html.erb
Unescape View File

@ -19,13 +19,13 @@
<div class="resource-check-all"> <div class="resource-check-all">
<input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" /> <input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" />
</div> </div>
<!--<a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a> --> <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a>
<a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div> <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="resourcesSelectSend mt10 fl"> <div class="resourcesSelectSend mt10 fl">
<!--<div class="resourcesSelectSendButton fl mr15 inactive-border" onclick="batch_send();">--> <div class="resourcesSelectSendButton fl mr15 inactive-border" onclick="batch_send();">
<!--&lt;!&ndash;<a href="javascript:void(0);" class="sendButtonBlue db inactive-text" data-remote="true">发送至</a>&ndash;&gt;--> <a href="javascript:void(0);" class="sendButtonBlue db inactive-text" data-remote="true">发送至</a>
<!--</div>--> </div>
<div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div> <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
</div> </div>
@ -215,7 +215,7 @@
document.oncontextmenu = function() {return true;} document.oncontextmenu = function() {return true;}
line.children().css("background-color",'white'); line.children().css("background-color",'white');
id = line.children().last().html(); id = line.children().last().html();
user_id = line.children().eq(6).html(); user_id = line.children().eq(5).html();
if(user_id === '<%= User.current.id %>') { if(user_id === '<%= User.current.id %>') {
res_name = line.children().eq(1).children().attr('title'); res_name = line.children().eq(1).children().attr('title');
res_link = line.children().eq(1).html(); res_link = line.children().eq(1).html();

2
app/views/users/_user_resource_tip_list.html.erb
Unescape View File

@ -1,7 +1,7 @@
<ul class="resource-list-tab mt10" id="resource_tip_list"> <ul class="resource-list-tab mt10" id="resource_tip_list">
<li class="resource-list-checkbox fl"> </li> <li class="resource-list-checkbox fl"> </li>
<li class="resource-list-name fl">资源名称</li> <li class="resource-list-name fl">资源名称</li>
<li class="resource-list-apply fr">操作</li> <!--<li class="resource-list-apply fr">操作</li>-->
<li class="resource-list-time fr"> <li class="resource-list-time fr">
<%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %> <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
<% if @order == "created_on" %> <% if @order == "created_on" %>

2
app/views/users/user_import_resource.js.erb
Unescape View File

@ -1,4 +1,4 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id,:seleted_resources=>@seleted_resources}) %>'); $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
showModal('ajax-modal', '730px'); showModal('ajax-modal', '730px');
$('#ajax-modal').css('height','500px').css("width","730px"); $('#ajax-modal').css('height','500px').css("width","730px");
$('#ajax-modal').siblings().remove(); $('#ajax-modal').siblings().remove();

13
app/views/users/user_ref_resource_search.js.erb
Unescape View File

@ -1,2 +1,11 @@
$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>'); $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); showModal('ajax-modal', '730px');
$('#ajax-modal').css('height','auto').css("width","730px");
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" + "<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");
$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed");
$('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");
$("#public_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '6') %>');
$("#my_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '1') %>');

6
app/views/users/user_resource.html.erb
Unescape View File

@ -55,9 +55,9 @@
<li class="fl resource-switch"> <li class="fl resource-switch">
<a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>" class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a> <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>" class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
</li> </li>
<li class="fl resource-switch"> <!--<li class="fl resource-switch">-->
<a href="<%= user_resource_user_path(@user, :type => '2', :status => 6) %>" class="resource-tab" id="private_resource_list" data-remote="true">申请资源</a> <!--<a href="<%#= user_resource_user_path(@user, :type => '2', :status => 6) %>" class="resource-tab" id="private_resource_list" data-remote="true">申请资源</a>-->
</li> <!--</li>-->
<li class="fl w680 border-bottom h34">&nbsp;</li> <li class="fl w680 border-bottom h34">&nbsp;</li>
<li class="fr resource-banner-li border-bottom h34"> <li class="fr resource-banner-li border-bottom h34">
<div id="user_resource_type_filter"> <div id="user_resource_type_filter">

Write Preview
Loading…
Cancel
Save