parent
25ee1d8672
commit
6688ba61dd
|
@ -6,7 +6,8 @@ class AppliedProjectController < ApplicationController
|
||||||
@project = Project.find(params[:project_id])
|
@project = Project.find(params[:project_id])
|
||||||
@applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
|
@applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
|
||||||
if @applieds.count == 0
|
if @applieds.count == 0
|
||||||
AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
|
appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
|
||||||
|
Mailer.applied_project(appliedproject).deliver
|
||||||
end
|
end
|
||||||
|
|
||||||
#redirect_to project_path(params[:project_id])
|
#redirect_to project_path(params[:project_id])
|
||||||
|
|
|
@ -23,6 +23,7 @@ class AttachmentsController < ApplicationController
|
||||||
|
|
||||||
before_filter :login_without_softapplication, only: [:download]
|
before_filter :login_without_softapplication, only: [:download]
|
||||||
accept_api_auth :show, :download, :upload
|
accept_api_auth :show, :download, :upload
|
||||||
|
require 'iconv'
|
||||||
|
|
||||||
def show
|
def show
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
@ -75,6 +76,25 @@ class AttachmentsController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# 更新文件密级
|
||||||
|
def updateFileDense
|
||||||
|
@attachment = Attachment.find(params[:attachmentid])
|
||||||
|
if @attachment != nil
|
||||||
|
filedense = params[:newtype].to_s
|
||||||
|
# d = Iconv.conv("unicodebig","utf-8",filedense)
|
||||||
|
if filedense == "%E5%85%AC%E5%BC%80" #l(:field_is_public)
|
||||||
|
@attachment.is_public = 1
|
||||||
|
else
|
||||||
|
@attachment.is_public = 0
|
||||||
|
end
|
||||||
|
@attachment.save
|
||||||
|
@newfiledense = filedense
|
||||||
|
end
|
||||||
|
respond_to do |format|
|
||||||
|
format.js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def thumbnail
|
def thumbnail
|
||||||
if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
|
if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
|
||||||
if stale?(:etag => thumbnail)
|
if stale?(:etag => thumbnail)
|
||||||
|
@ -89,6 +109,7 @@ class AttachmentsController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def upload
|
def upload
|
||||||
# Make sure that API users get used to set this content type
|
# Make sure that API users get used to set this content type
|
||||||
# as it won't trigger Rails' automatic parsing of the request body for parameters
|
# as it won't trigger Rails' automatic parsing of the request body for parameters
|
||||||
|
|
|
@ -746,7 +746,7 @@ class ProjectsController < ApplicationController
|
||||||
#Added by young
|
#Added by young
|
||||||
# @course_tag = params[:course]
|
# @course_tag = params[:course]
|
||||||
# if @course_tag == '1'
|
# if @course_tag == '1'
|
||||||
@course = Course.find_by_extra(@project.identifier)
|
#@course = Course.find_by_extra(@project.identifier)
|
||||||
# if @project.project_type == 1
|
# if @project.project_type == 1
|
||||||
# render :layout => 'base_courses'
|
# render :layout => 'base_courses'
|
||||||
# else
|
# else
|
||||||
|
|
|
@ -109,7 +109,7 @@ module AttachmentsHelper
|
||||||
domain = project.nil? ? attachAll : nobelong_attach
|
domain = project.nil? ? attachAll : nobelong_attach
|
||||||
|
|
||||||
# 搜索到的资源
|
# 搜索到的资源
|
||||||
searched_attach = domain.where("filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
|
searched_attach = domain.where("is_public=1 and filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
|
||||||
#searched_attach = private_filter searched_attach
|
#searched_attach = private_filter searched_attach
|
||||||
searched_attach = paginateHelper(searched_attach, 10)
|
searched_attach = paginateHelper(searched_attach, 10)
|
||||||
|
|
||||||
|
@ -148,7 +148,7 @@ module AttachmentsHelper
|
||||||
domain = course.nil? ? attachAll : nobelong_attach
|
domain = course.nil? ? attachAll : nobelong_attach
|
||||||
|
|
||||||
# 搜索到的资源
|
# 搜索到的资源
|
||||||
searched_attach = domain.where("filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
|
searched_attach = domain.where("is_public=1 and filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
|
||||||
#searched_attach = private_filter searched_attach
|
#searched_attach = private_filter searched_attach
|
||||||
searched_attach = paginateHelper(searched_attach, 10)
|
searched_attach = paginateHelper(searched_attach, 10)
|
||||||
|
|
||||||
|
|
|
@ -196,6 +196,21 @@ class Attachment < ActiveRecord::Base
|
||||||
suffix
|
suffix
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# 文件密级的字符描述
|
||||||
|
def file_dense_str
|
||||||
|
if self.is_public == 1
|
||||||
|
dense = l(:field_is_public)
|
||||||
|
else
|
||||||
|
dense = l(:field_is_private)
|
||||||
|
end
|
||||||
|
dense
|
||||||
|
end
|
||||||
|
|
||||||
|
# 文件可设置的密级列表
|
||||||
|
def file_dense_list
|
||||||
|
denselist = [l(:field_is_public),l(:field_is_private)]
|
||||||
|
end
|
||||||
|
|
||||||
def suffixArr
|
def suffixArr
|
||||||
@@SuffixArr
|
@@SuffixArr
|
||||||
end
|
end
|
||||||
|
|
|
@ -90,6 +90,18 @@ class Course < ActiveRecord::Base
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Returns the mail adresses of users that should be always notified on project events
|
||||||
|
def recipients
|
||||||
|
notified_users.collect {|user| user.mail}
|
||||||
|
end
|
||||||
|
|
||||||
|
# Returns the users that should be notified on project events
|
||||||
|
def notified_users
|
||||||
|
# TODO: User part should be extracted to User#notify_about?
|
||||||
|
members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
# 课程的短描述信息
|
# 课程的短描述信息
|
||||||
def short_description(length = 255)
|
def short_description(length = 255)
|
||||||
description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
|
description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
|
||||||
|
@ -112,6 +124,7 @@ class Course < ActiveRecord::Base
|
||||||
@attachmenttypes = Attachmentstype.find(:all, :conditions => ["#{Attachmentstype.table_name}.typeId= ?",self.attachmenttype ])
|
@attachmenttypes = Attachmentstype.find(:all, :conditions => ["#{Attachmentstype.table_name}.typeId= ?",self.attachmenttype ])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
# 获取资源后缀名列表
|
# 获取资源后缀名列表
|
||||||
def contenttypes
|
def contenttypes
|
||||||
attachmenttypes
|
attachmenttypes
|
||||||
|
|
|
@ -141,6 +141,19 @@ class Mailer < ActionMailer::Base
|
||||||
:subject => s
|
:subject => s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# 用户申请加入项目邮件通知
|
||||||
|
def applied_project(applied)
|
||||||
|
@project =applied.project
|
||||||
|
redmine_headers 'Project' => @project,
|
||||||
|
'User' => applied.user
|
||||||
|
@user = applied.user
|
||||||
|
recipients = @project.manager_recipients
|
||||||
|
s = l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name)
|
||||||
|
@applied_url = url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'members')
|
||||||
|
mail :to => recipients,
|
||||||
|
:subject => s
|
||||||
|
end
|
||||||
|
|
||||||
def reminder(user, issues, days)
|
def reminder(user, issues, days)
|
||||||
set_language_if_valid user.language
|
set_language_if_valid user.language
|
||||||
@issues = issues
|
@issues = issues
|
||||||
|
@ -180,16 +193,35 @@ class Mailer < ActionMailer::Base
|
||||||
when 'Project'
|
when 'Project'
|
||||||
added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
|
added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
|
||||||
added_to = "#{l(:label_project)}: #{container}"
|
added_to = "#{l(:label_project)}: #{container}"
|
||||||
recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail}
|
recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
|
||||||
|
when 'Course'
|
||||||
|
added_to_url = url_for(:controller => 'files', :action => 'index', :course_id => container)
|
||||||
|
added_to = "#{l(:label_course)}: #{container}"
|
||||||
|
recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
|
||||||
when 'Version'
|
when 'Version'
|
||||||
added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
|
added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
|
||||||
added_to = "#{l(:label_version)}: #{container.name}"
|
added_to = "#{l(:label_version)}: #{container.name}"
|
||||||
recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect {|u| u.mail}
|
recipients = container.project.notified_users.select { |user| user.allowed_to?(:view_files, container.project) }.collect { |u| u.mail }
|
||||||
when 'Document'
|
when 'Document'
|
||||||
added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
|
added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
|
||||||
added_to = "#{l(:label_document)}: #{container.title}"
|
added_to = "#{l(:label_document)}: #{container.title}"
|
||||||
recipients = container.recipients
|
recipients = container.recipients
|
||||||
end
|
end
|
||||||
|
if container.class.name == 'Course'
|
||||||
|
redmine_headers 'Course' => container.id
|
||||||
|
@attachments = attachments
|
||||||
|
@added_to = added_to
|
||||||
|
@added_to_url = added_to_url
|
||||||
|
mail :to => recipients,
|
||||||
|
:subject => "[#{container.name}] #{l(:label_attachment_new)}"
|
||||||
|
elsif container.class.name == 'Project'
|
||||||
|
redmine_headers 'Project' => container.id
|
||||||
|
@attachments = attachments
|
||||||
|
@added_to = added_to
|
||||||
|
@added_to_url = added_to_url
|
||||||
|
mail :to => recipients,
|
||||||
|
:subject => "[#{container.name}] #{l(:label_attachment_new)}"
|
||||||
|
else
|
||||||
redmine_headers 'Project' => container.project.identifier
|
redmine_headers 'Project' => container.project.identifier
|
||||||
@attachments = attachments
|
@attachments = attachments
|
||||||
@added_to = added_to
|
@added_to = added_to
|
||||||
|
@ -197,6 +229,7 @@ class Mailer < ActionMailer::Base
|
||||||
mail :to => recipients,
|
mail :to => recipients,
|
||||||
:subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
|
:subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Builds a Mail::Message object used to email recipients of a news' project when a news item is added.
|
# Builds a Mail::Message object used to email recipients of a news' project when a news item is added.
|
||||||
#
|
#
|
||||||
|
|
|
@ -207,6 +207,12 @@ class Project < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
# end
|
# end
|
||||||
|
|
||||||
|
# 管理员的邮件列表
|
||||||
|
def manager_recipients
|
||||||
|
notified = project.project_infos.collect(&:user)
|
||||||
|
notified.collect(&:mail)
|
||||||
|
end
|
||||||
|
|
||||||
def initialize(attributes=nil, *args)
|
def initialize(attributes=nil, *args)
|
||||||
super
|
super
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
<% container.attachments.each_with_index do |attachment, i| %>
|
<% container.attachments.each_with_index do |attachment, i| %>
|
||||||
<span id="attachments_p<%= i %>" class="attachment">
|
<span id="attachments_p<%= i %>" class="attachment">
|
||||||
<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
|
<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
|
||||||
|
|
||||||
<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
|
<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
|
||||||
link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
|
link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
|
||||||
<%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
|
<%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
|
||||||
|
<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
|
||||||
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
|
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
$('#edit-file-dense-form-<%= @attachment.id.to_s%>').hide();
|
||||||
|
$('#field_file_dense_id_label<%= @attachment.id.to_s%>').show();
|
||||||
|
$('#edit_box_dense<%= @attachment.id.to_s%>').show();
|
||||||
|
<%if @attachment.is_public == 1%>
|
||||||
|
$('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('公开');
|
||||||
|
<%else%>
|
||||||
|
$('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('私有');
|
||||||
|
<%end%>
|
||||||
|
// 下面2种写法都没起作用,暂时使用上面的非本地化模式
|
||||||
|
// <%if @attachment.is_public == 1%>
|
||||||
|
// $('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('<%l(:field_is_public)%>');
|
||||||
|
// <%else%>
|
||||||
|
// $('#field_file_dense_id_label<%= @attachment.id.to_s%>').html('<%l(:field_is_private)%>');
|
||||||
|
// <%end%>
|
||||||
|
// $('#field_file_dense_id_label<%= @attachment.id.to_s%>').html(<%=@newfiledense%>);
|
|
@ -0,0 +1,13 @@
|
||||||
|
<% edit_allowed = User.current.allowed_to?(:manage_files, @course) %>
|
||||||
|
<% if file_dense_list.any? %>
|
||||||
|
<div id="edit-file-dense-form-<%=attachment.id%>" class="hidden">
|
||||||
|
<%= select_tag "file_dense",
|
||||||
|
options_for_select(file_dense_list,attachment.file_dense_str), :onchange=>"file_dense_edit("+attachment.id.to_s + ",this.value)"%>
|
||||||
|
</div>
|
||||||
|
<%= link_to(image_tag('edit/edit.png'), 'javascript:void(0);',:style=>"white-space:nowrap;", :id=>"edit_box_dense"+attachment.id.to_s ,
|
||||||
|
:onclick =>"$('#edit-file-dense-form-" +attachment.id.to_s+ "').show();
|
||||||
|
$('#field_file_dense_id_label" +attachment.id.to_s+ "').hide();
|
||||||
|
$('#edit_box_dense" +attachment.id.to_s+ "').hide();") if edit_allowed %>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
||||||
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
||||||
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
|
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
|
||||||
|
<%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
|
||||||
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
||||||
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
||||||
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
||||||
|
@ -34,6 +35,9 @@
|
||||||
</tr>
|
</tr>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% container.attachments.each do |file| %>
|
<% container.attachments.each do |file| %>
|
||||||
|
<%if file.is_public == 0 && !User.current.member_of?(@project)%>
|
||||||
|
<%next%>
|
||||||
|
<%end%>
|
||||||
<tr class="file <%= cycle("odd", "odd") %>">
|
<tr class="file <%= cycle("odd", "odd") %>">
|
||||||
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
||||||
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
||||||
|
@ -45,6 +49,14 @@
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="content_type"><%= file.show_suffix_type %></td>
|
<td class="content_type"><%= file.show_suffix_type %></td>
|
||||||
|
<td class="field_file_dense">
|
||||||
|
<span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
|
||||||
|
|
||||||
|
<span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
|
||||||
|
<%= render :partial => 'course_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
|
||||||
|
:attachment => file} %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td class="downloads"><%= file.downloads %></td>
|
<td class="downloads"><%= file.downloads %></td>
|
||||||
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
||||||
<td align="center">
|
<td align="center">
|
||||||
|
|
|
@ -10,24 +10,28 @@
|
||||||
<col class="vzebra-odd"/>
|
<col class="vzebra-odd"/>
|
||||||
<col class="vzebra-even"/>
|
<col class="vzebra-even"/>
|
||||||
<!-- <col class="vzebra-odd"/> -->
|
<!-- <col class="vzebra-odd"/> -->
|
||||||
</colgroup>
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
|
<%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
|
||||||
<%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
|
<%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
|
||||||
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
||||||
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
||||||
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
|
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
|
||||||
|
<%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
|
||||||
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
||||||
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
||||||
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<% @containers.each do |container| %>
|
<% @containers.each do |container| %>
|
||||||
<% next if container.attachments.empty? -%>
|
<% next if container.attachments.empty? -%>
|
||||||
<% container.attachments.each do |file| %>
|
<% container.attachments.each do |file| %>
|
||||||
<% if isTypeOk(file,selAttachType,selContentType) %>
|
<% if file.is_public == 0 && !User.current.member_of?(@project) %>
|
||||||
|
<% next %>
|
||||||
|
<% end %>
|
||||||
|
<% if isTypeOk(file, selAttachType, selContentType) %>
|
||||||
<tr class="file <%= cycle("odd", "odd") %>">
|
<tr class="file <%= cycle("odd", "odd") %>">
|
||||||
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
||||||
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
||||||
|
@ -37,10 +41,18 @@
|
||||||
|
|
||||||
<span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
|
<span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
|
||||||
<%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes,
|
<%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes,
|
||||||
:attachment => file,:contentype=>selContentType} %>
|
:attachment => file, :contentype => selContentType} %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="content_type"><%= file.show_suffix_type %></td>
|
<td class="content_type"><%= file.show_suffix_type %></td>
|
||||||
|
<td class="field_file_dense">
|
||||||
|
<span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
|
||||||
|
|
||||||
|
<span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
|
||||||
|
<%= render :partial => 'course_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
|
||||||
|
:attachment => file} %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td class="downloads"><%= file.downloads %></td>
|
<td class="downloads"><%= file.downloads %></td>
|
||||||
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
||||||
<td align="center">
|
<td align="center">
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
<% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
|
||||||
|
<% if file_dense_list.any? %>
|
||||||
|
<div id="edit-file-dense-form-<%=attachment.id%>" class="hidden">
|
||||||
|
<%= select_tag "file_dense",
|
||||||
|
options_for_select(file_dense_list,attachment.file_dense_str), :onchange=>"file_dense_edit("+attachment.id.to_s + ",this.value)"%>
|
||||||
|
</div>
|
||||||
|
<%= link_to(image_tag('edit/edit.png'), 'javascript:void(0);',:style=>"white-space:nowrap;", :id=>"edit_box_dense"+attachment.id.to_s ,
|
||||||
|
:onclick =>"$('#edit-file-dense-form-" +attachment.id.to_s+ "').show();
|
||||||
|
$('#field_file_dense_id_label" +attachment.id.to_s+ "').hide();
|
||||||
|
$('#edit_box_dense" +attachment.id.to_s+ "').hide();") if edit_allowed %>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
||||||
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
||||||
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
|
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
|
||||||
|
<%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
|
||||||
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
||||||
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
||||||
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
||||||
|
@ -34,6 +35,9 @@
|
||||||
</tr>
|
</tr>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% container.attachments.each do |file| %>
|
<% container.attachments.each do |file| %>
|
||||||
|
<%if file.is_public == 0 && !User.current.member_of?(@project)%>
|
||||||
|
<%next%>
|
||||||
|
<%end%>
|
||||||
<tr class="file <%= cycle("odd", "odd") %>">
|
<tr class="file <%= cycle("odd", "odd") %>">
|
||||||
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
||||||
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
||||||
|
@ -45,6 +49,14 @@
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="content_type"><%= file.show_suffix_type %></td>
|
<td class="content_type"><%= file.show_suffix_type %></td>
|
||||||
|
<td class="field_file_dense">
|
||||||
|
<span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
|
||||||
|
|
||||||
|
<span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
|
||||||
|
<%= render :partial => 'project_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
|
||||||
|
:attachment => file} %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td class="downloads"><%= file.downloads %></td>
|
<td class="downloads"><%= file.downloads %></td>
|
||||||
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
||||||
<td align="center">
|
<td align="center">
|
||||||
|
|
|
@ -10,24 +10,28 @@
|
||||||
<col class="vzebra-odd"/>
|
<col class="vzebra-odd"/>
|
||||||
<col class="vzebra-even"/>
|
<col class="vzebra-even"/>
|
||||||
<!-- <col class="vzebra-odd"/> -->
|
<!-- <col class="vzebra-odd"/> -->
|
||||||
</colgroup>
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
|
<%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
|
||||||
<%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
|
<%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
|
||||||
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
|
||||||
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
<%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
|
||||||
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
|
<%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
|
||||||
|
<%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
|
||||||
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
<%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
|
||||||
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
<%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
|
||||||
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
<!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<% @containers.each do |container| %>
|
<% @containers.each do |container| %>
|
||||||
<% next if container.attachments.empty? -%>
|
<% next if container.attachments.empty? -%>
|
||||||
<% container.attachments.each do |file| %>
|
<% container.attachments.each do |file| %>
|
||||||
<% if isTypeOk(file,selAttachType,selContentType) %>
|
<% if file.is_public == 0 && !User.current.member_of?(@project) %>
|
||||||
|
<% next %>
|
||||||
|
<% end %>
|
||||||
|
<% if isTypeOk(file, selAttachType, selContentType) %>
|
||||||
<tr class="file <%= cycle("odd", "odd") %>">
|
<tr class="file <%= cycle("odd", "odd") %>">
|
||||||
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
<td class="filename" style="font-size: 13px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
|
||||||
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
<!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
|
||||||
|
@ -37,10 +41,18 @@
|
||||||
|
|
||||||
<span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
|
<span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
|
||||||
<%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes,
|
<%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes,
|
||||||
:attachment => file,:contentype=>selContentType} %>
|
:attachment => file, :contentype => selContentType} %>
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="content_type"><%= file.show_suffix_type %></td>
|
<td class="content_type"><%= file.show_suffix_type %></td>
|
||||||
|
<td class="field_file_dense">
|
||||||
|
<span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
|
||||||
|
|
||||||
|
<span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
|
||||||
|
<%= render :partial => 'project_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
|
||||||
|
:attachment => file} %>
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td class="downloads"><%= file.downloads %></td>
|
<td class="downloads"><%= file.downloads %></td>
|
||||||
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
<!-- <td class="digest" width="300px"><%= file.description %></td> -->
|
||||||
<td align="center">
|
<td align="center">
|
||||||
|
|
|
@ -207,6 +207,23 @@
|
||||||
<%end%>
|
<%end%>
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 编辑文件密级
|
||||||
|
function file_dense_edit(id, type) {
|
||||||
|
$.ajax({
|
||||||
|
url: '<%=updateFileDense_attachments_path%>',
|
||||||
|
type: "POST",
|
||||||
|
remote:"true",
|
||||||
|
data: {
|
||||||
|
attachmentid: encodeURIComponent(id),
|
||||||
|
newtype: encodeURIComponent(type)
|
||||||
|
}
|
||||||
|
|
||||||
|
}).complete(function (xhr, textStatus) {
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %>
|
||||||
|
<hr />
|
||||||
|
|
||||||
|
<h1><%= link_to(h(@project.name), @applied_url) %></h1>
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %>
|
||||||
|
|
||||||
|
<h1><%= link_to(h(@project.name), @applied_url) %></h1>
|
||||||
|
|
|
@ -233,6 +233,7 @@ en:
|
||||||
field_mail: Email
|
field_mail: Email
|
||||||
field_job_category: Job category # added by bai
|
field_job_category: Job category # added by bai
|
||||||
field_filename: File
|
field_filename: File
|
||||||
|
field_file_dense: File Dense
|
||||||
field_filesize: Size
|
field_filesize: Size
|
||||||
field_downloads: Downloads
|
field_downloads: Downloads
|
||||||
field_author: Author
|
field_author: Author
|
||||||
|
@ -1079,6 +1080,7 @@ en:
|
||||||
text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
|
text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
|
||||||
text_project_closed: This project is closed and read-only.
|
text_project_closed: This project is closed and read-only.
|
||||||
text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
|
text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
|
||||||
|
text_applied_project: "User %{id} Apply Join Project %{project}"
|
||||||
|
|
||||||
default_role_manager: Manager
|
default_role_manager: Manager
|
||||||
default_role_developer: Developer
|
default_role_developer: Developer
|
||||||
|
|
|
@ -251,6 +251,7 @@ zh:
|
||||||
field_lastname_eg: '(例:张三丰,请填写[张])'
|
field_lastname_eg: '(例:张三丰,请填写[张])'
|
||||||
field_mail: 邮件地址
|
field_mail: 邮件地址
|
||||||
field_filename: 文件
|
field_filename: 文件
|
||||||
|
field_file_dense: 文件密级
|
||||||
field_filesize: 大小
|
field_filesize: 大小
|
||||||
field_downloads: 下载次数
|
field_downloads: 下载次数
|
||||||
field_author: 作者
|
field_author: 作者
|
||||||
|
@ -1105,6 +1106,7 @@ zh:
|
||||||
text_own_membership_delete_confirmation: 你正在删除你现有的某些或全部权限,如果这样做了你可能将会再也无法编辑该项目了。你确定要继续吗?
|
text_own_membership_delete_confirmation: 你正在删除你现有的某些或全部权限,如果这样做了你可能将会再也无法编辑该项目了。你确定要继续吗?
|
||||||
text_zoom_in: 放大
|
text_zoom_in: 放大
|
||||||
text_zoom_out: 缩小
|
text_zoom_out: 缩小
|
||||||
|
text_applied_project: "用户 %{id} 申请加入项目 %{project}"
|
||||||
|
|
||||||
default_role_manager: 管理人员
|
default_role_manager: 管理人员
|
||||||
default_role_developer: 开发人员
|
default_role_developer: 开发人员
|
||||||
|
|
|
@ -515,6 +515,7 @@ RedmineApp::Application.routes.draw do
|
||||||
resources :attachments, :only => [:show, :destroy] do
|
resources :attachments, :only => [:show, :destroy] do
|
||||||
collection do
|
collection do
|
||||||
match "updateType" , via: [:get, :post]
|
match "updateType" , via: [:get, :post]
|
||||||
|
match "updateFileDense" , via: [:get, :post]
|
||||||
match "renderTag" , via: [:get, :post]
|
match "renderTag" , via: [:get, :post]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
class AddIsPublicToAttachment < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :attachments, :is_public, :integer,:default => 1
|
||||||
|
end
|
||||||
|
end
|
|
@ -0,0 +1,22 @@
|
||||||
|
class UpdateAttachmentPublicAttr < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
# 更新资源文件的is_public属性
|
||||||
|
Attachment.all.each do |res|
|
||||||
|
if res.is_public
|
||||||
|
if(res.container.nil? ||
|
||||||
|
(res.container.class.to_s=="Project" && res.container.is_public == false) ||
|
||||||
|
(res.container.has_attribute?(:project) && res.container.project && res.container.project.is_public == false) ||
|
||||||
|
(res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
|
||||||
|
(res.container.class.to_s=="Course" && res.container.is_public == false) ||
|
||||||
|
(res.container.has_attribute?(:course) && res.container.course && res.container.course.is_public == false)
|
||||||
|
)
|
||||||
|
res.is_public = false
|
||||||
|
res.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20140707095213) do
|
ActiveRecord::Schema.define(:version => 20140710030426) do
|
||||||
|
|
||||||
create_table "activities", :force => true do |t|
|
create_table "activities", :force => true do |t|
|
||||||
t.integer "act_id", :null => false
|
t.integer "act_id", :null => false
|
||||||
|
@ -51,6 +51,7 @@ ActiveRecord::Schema.define(:version => 20140707095213) do
|
||||||
t.string "description"
|
t.string "description"
|
||||||
t.string "disk_directory"
|
t.string "disk_directory"
|
||||||
t.integer "attachtype", :default => 1
|
t.integer "attachtype", :default => 1
|
||||||
|
t.integer "is_public", :default => 1
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
|
add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
|
||||||
|
|
|
@ -60,11 +60,28 @@ module Redmine
|
||||||
@unsaved_attachments ||= []
|
@unsaved_attachments ||= []
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# 设置资源文件的公开属性
|
||||||
|
# add by nwb
|
||||||
|
def set_attachment_public(res)
|
||||||
|
# 公开的资源判断他的父级的公开属性
|
||||||
|
if res.is_public
|
||||||
|
if( (self.class.to_s=="Project" && self.is_public == false) ||
|
||||||
|
(self.has_attribute?(:project) && self.project && self.project.is_public == false) ||
|
||||||
|
(self.class.to_s=="HomeworkAttach" && self.bid.reward_type == 3) ||
|
||||||
|
(self.class.to_s=="Course" && self.is_public == false) ||
|
||||||
|
(self.has_attribute?(:course) && self.course && self.course.is_public == false)
|
||||||
|
)
|
||||||
|
res.is_public = false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def save_attachmentsex(attachments, author=User.current,attachment_type)
|
def save_attachmentsex(attachments, author=User.current,attachment_type)
|
||||||
@curattachment_type = attachment_type
|
@curattachment_type = attachment_type
|
||||||
result = save_attachments(attachments,author)
|
result = save_attachments(attachments,author)
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
|
|
||||||
def save_attachments(attachments, author=User.current)
|
def save_attachments(attachments, author=User.current)
|
||||||
if attachments.is_a?(Hash)
|
if attachments.is_a?(Hash)
|
||||||
attachments = attachments.stringify_keys
|
attachments = attachments.stringify_keys
|
||||||
|
@ -94,6 +111,10 @@ module Redmine
|
||||||
a.filename = attachment['filename'] unless attachment['filename'].blank?
|
a.filename = attachment['filename'] unless attachment['filename'].blank?
|
||||||
a.content_type = attachment['content_type']
|
a.content_type = attachment['content_type']
|
||||||
end
|
end
|
||||||
|
if !attachment[:is_public]
|
||||||
|
a.is_public = false
|
||||||
|
end
|
||||||
|
set_attachment_public(a)
|
||||||
next unless a
|
next unless a
|
||||||
a.description = attachment['description'].to_s.strip
|
a.description = attachment['description'].to_s.strip
|
||||||
a.attachtype = @curattachment_type;
|
a.attachtype = @curattachment_type;
|
||||||
|
|
|
@ -23,6 +23,8 @@ function addFile(inputEl, file, eagerUpload) {
|
||||||
fileSpan.append(
|
fileSpan.append(
|
||||||
$('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
|
$('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
|
||||||
$('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 255, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
|
$('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 255, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
|
||||||
|
$('<span >公开:</span>').attr({ 'class': 'ispublic-label' }) ,
|
||||||
|
$('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public]', checked:'checked' } ).toggle(!eagerUpload),
|
||||||
$('<a> </a>').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗?" }).click(removeFile).toggle(!eagerUpload),
|
$('<a> </a>').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗?" }).click(removeFile).toggle(!eagerUpload),
|
||||||
$('<div>', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
|
$('<div>', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
|
||||||
).appendTo('#attachments_fields');
|
).appendTo('#attachments_fields');
|
||||||
|
@ -63,6 +65,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
|
||||||
.done(function(result) {
|
.done(function(result) {
|
||||||
progressSpan.progressbar( 'value', 100 ).remove();
|
progressSpan.progressbar( 'value', 100 ).remove();
|
||||||
fileSpan.find('input.description, a').css('display', 'inline-block');
|
fileSpan.find('input.description, a').css('display', 'inline-block');
|
||||||
|
fileSpan.find('input.is_public_checkbox, a').css('display', 'inline-block');
|
||||||
})
|
})
|
||||||
.fail(function(result) {
|
.fail(function(result) {
|
||||||
progressSpan.text(result.statusText);
|
progressSpan.text(result.statusText);
|
||||||
|
|
|
@ -1850,6 +1850,8 @@ span.required {color: #bb0000;}
|
||||||
#attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
|
#attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
|
||||||
a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
|
a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
|
||||||
a.remove-upload:hover {text-decoration:none !important;}
|
a.remove-upload:hover {text-decoration:none !important;}
|
||||||
|
#attachments_fields input.is_public_checkbox {width:20px;}
|
||||||
|
#attachments_fields span.ispublic-label {width:50px;margin-left:10px; }
|
||||||
|
|
||||||
/*gcm upload file count and deleteall*/
|
/*gcm upload file count and deleteall*/
|
||||||
#upload_file_count #count {color:red; font-size:1.5em;}
|
#upload_file_count #count {color:red; font-size:1.5em;}
|
||||||
|
|
|
@ -1081,6 +1081,11 @@ div.tags_area {
|
||||||
border-bottom: 1px solid #c8d4fd;
|
border-bottom: 1px solid #c8d4fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ver-zebra #vzebra-field_file_dense, #ver-zebra #vzebra-children {
|
||||||
|
background: #ffffff;
|
||||||
|
border-bottom: 1px solid #c8d4fd;
|
||||||
|
}
|
||||||
|
|
||||||
#ver-zebra #vzebra-comedy, #ver-zebra #vzebra-action {
|
#ver-zebra #vzebra-comedy, #ver-zebra #vzebra-action {
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
border-bottom: 1px solid #d6dfff;
|
border-bottom: 1px solid #d6dfff;
|
||||||
|
|
Loading…
Reference in New Issue