Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/admin_controller.rb

@@ -234,4 +234,96 @@ class AdminController < ApplicationController
       format.api
     end
   end
+
+  #首页定制
+  def first_page_made
+    if request.get?
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @first_page.web_title = params[:web_title]
+      @first_page.description = params[:description]
+      @first_page.title = params[:title]
+      if @first_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_first_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            first_page_made
+            render :action => 'first_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+        end
+      end
+    end
+  end
+
+  def course_page_made
+    if request.get?
+      @course_page = FirstPage.where("page_type = 'course'").first
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @course_page = FirstPage.where("page_type = 'course'").first
+      @first_page.web_title = params[:web_title]
+      @course_page.title = params[:course_title]
+      @course_page.description = params[:course_description]
+      if @first_page.save && @course_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_course_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            course_page_made
+            render :action => 'course_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+          format.api  { render_validation_errors(@course_page) }
+        end
+      end
+    end
+  end
+
+  def contest_page_made
+    if request.get?
+      @contest_page = FirstPage.where("page_type = 'contest'").first
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @contest_page = FirstPage.where("page_type = 'contest'").first
+      @first_page.web_title = params[:web_title]
+      @contest_page.title = params[:contest_title]
+      @contest_page.description = params[:contest_description]
+      if @first_page.save && @contest_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_contest_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            contest_page_made
+            render :action => 'contest_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+          format.api  { render_validation_errors(@contest_page) }
+        end
+      end
+    end
+  end
+
 end

app/controllers/applied_project_controller.rb

@@ -6,7 +6,8 @@ class AppliedProjectController < ApplicationController
     @project = Project.find(params[:project_id])
     @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
     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
 
     #redirect_to project_path(params[:project_id])

app/controllers/attachments_controller.rb

@@ -23,6 +23,7 @@ class AttachmentsController < ApplicationController
   
   before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
+  require 'iconv'
 
   def show
     respond_to do |format|
@@ -49,19 +50,39 @@ class AttachmentsController < ApplicationController
   end
 
   def download
-    if true || @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
+    # modify by nwb
+    # 下载添加权限设置
+    candown = false
+    if @attachment.container.has_attribute?(:project) && @attachment.container.project
+      project = @attachment.container.project
+      candown= User.current.member_of?(project)
+    elsif  @attachment.container.is_a?(Project)
+      project = @attachment.container
+      candown= User.current.member_of?(project)
+    elsif @attachment.container.has_attribute?(:course) && @attachment.container.course
+      course = @attachment.container.course
+      candown= User.current.member_of_course?(course)
+    elsif @attachment.container.is_a?(Course)
+      course = @attachment.container
+      candown= User.current.member_of_course?(course)
+    elsif @attachment.container.class.to_s=="HomeworkAttach" && @attachment.container.bid.reward_type == 3
+      candown = true
+    end
+    if candown || User.current.admin?
       @attachment.increment_download
+    else
+      render_403 :message => :notice_not_authorized
     end
 
+
     if stale?(:etag => @attachment.digest)
       # images are sent inline
       send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                                      :type => detect_content_type(@attachment),
-                                      :disposition => (@attachment.image? ? 'inline' : 'attachment')
+                :type => detect_content_type(@attachment),
+                :disposition => (@attachment.image? ? 'inline' : 'attachment')
     end
   rescue => e
     redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html"
-    return
   end
 
   #更新资源文件类型
@@ -76,6 +97,25 @@ class AttachmentsController < ApplicationController
     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
     if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
       if stale?(:etag => thumbnail)
@@ -90,6 +130,7 @@ class AttachmentsController < ApplicationController
     end
   end
 
+
   def upload
     # 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

app/controllers/projects_controller.rb

@@ -746,7 +746,7 @@ class ProjectsController < ApplicationController
     #Added by young
     # @course_tag = params[:course]
     # if @course_tag == '1'
-    @course = Course.find_by_extra(@project.identifier)
+    #@course = Course.find_by_extra(@project.identifier)
     # if @project.project_type == 1
     #   render :layout => 'base_courses'
     # else

app/controllers/welcome_controller.rb

@@ -16,12 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
+  include ApplicationHelper
   caches_action :robots
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
-
+    @first_page = FirstPage.where("page_type = 'project'").first
   end
 
   def robots
@@ -30,6 +31,7 @@ class WelcomeController < ApplicationController
   end
   
   def course
+    @course_page = FirstPage.where("page_type = 'course'").first
     if params[:school_id]
       @school_id = params[:school_id]
     elsif User.current.logged?  && User.current.user_extensions.school
@@ -41,13 +43,24 @@ class WelcomeController < ApplicationController
   
   
  def logolink()
+   @course_page = FirstPage.where("page_type = 'course'").first
+   logo = get_avatar?(@course_page)
     id = params[:school_id]
     logo_link = ""
-    if id.nil? and User.current.user_extensions.school.nil?
-      logo_link = '/images/transparent.png'
+    if id.nil? && User.current.user_extensions.school.nil?
+      if logo
+        logo_link = url_to_avatar(@course_page)
+      else
+        logo_link = '/images/transparent.png'
+      end
+
     else
       if id == "0"
-        logo_link = '/images/transparent.png'
+        if logo
+          logo_link = url_to_avatar(@course_page)
+        else
+          logo_link = '/images/transparent.png'
+        end
       else
         if id.nil?
           if School.find(User.current.user_extensions.school.id).logo_link.nil?
@@ -66,7 +79,7 @@ class WelcomeController < ApplicationController
   
   
   def contest
-
+    @contest_page = FirstPage.where("page_type = 'contest'").first
   end
 
   def search

app/helpers/application_helper.rb

@@ -625,10 +625,15 @@ module ApplicationHelper
   end
 
   def html_title(*args)
+    first_page = FirstPage.where("page_type = 'project'").first
     if args.empty?
       title = @html_title || []
       title << @project.name if @project
-      title << Setting.app_title unless Setting.app_title == title.last
+      if first_page.nil? || first_page.web_title.nil?
+        title << Setting.app_title unless Setting.app_title == title.last
+      else
+        title << first_page.web_title unless  first_page.web_title == title.last
+      end
       title.select {|t| !t.blank? }.join(' - ')
     else
       @html_title ||= []

app/helpers/attachments_helper.rb

@@ -109,7 +109,7 @@ module AttachmentsHelper
     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 = paginateHelper(searched_attach, 10)
 
@@ -148,7 +148,7 @@ module AttachmentsHelper
     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 = paginateHelper(searched_attach, 10)
 

app/models/attachment.rb

@@ -196,6 +196,21 @@ class Attachment < ActiveRecord::Base
     suffix
   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
     @@SuffixArr
   end

app/models/course.rb

@@ -90,6 +90,18 @@ class Course < ActiveRecord::Base
     false
   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)
     description.gsub(/<\/?.*?>/,"").html_safe if description
@@ -124,6 +136,7 @@ class Course < ActiveRecord::Base
     @attachmenttypes = Attachmentstype.find(:all, :conditions => ["#{Attachmentstype.table_name}.typeId= ?",self.attachmenttype ])
   end
 
+
   # 获取资源后缀名列表
   def contenttypes
     attachmenttypes

app/models/first_page.rb

@@ -0,0 +1,3 @@
+class FirstPage < ActiveRecord::Base
+  attr_accessible :description, :title, :web_title
+end

app/models/mailer.rb

@@ -141,6 +141,19 @@ class Mailer < ActionMailer::Base
       :subject => s
   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)
     set_language_if_valid user.language
     @issues = issues
@@ -177,25 +190,45 @@ class Mailer < ActionMailer::Base
     added_to_url = ''
     @author = attachments.first.author
     case container.class.name
-    when 'Project'
-      added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => 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}
-    when 'Version'
-      added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
-      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}
-    when 'Document'
-      added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
-      added_to = "#{l(:label_document)}: #{container.title}"
-      recipients = container.recipients
+      when 'Project'
+        added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
+        added_to = "#{l(:label_project)}: #{container}"
+        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'
+        added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
+        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 }
+      when 'Document'
+        added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
+        added_to = "#{l(:label_document)}: #{container.title}"
+        recipients = container.recipients
+    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
+      @attachments = attachments
+      @added_to = added_to
+      @added_to_url = added_to_url
+      mail :to => recipients,
+           :subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
     end
-    redmine_headers 'Project' => container.project.identifier
-    @attachments = attachments
-    @added_to = added_to
-    @added_to_url = added_to_url
-    mail :to => recipients,
-      :subject => "[#{container.project.name}] #{l(:label_attachment_new)}"
   end
 
   # Builds a Mail::Message object used to email recipients of a news' project when a news item is added.

app/models/project.rb

@@ -207,6 +207,12 @@ class Project < ActiveRecord::Base
   end
 # end
 
+  # 管理员的邮件列表
+  def manager_recipients
+    notified = project.project_infos.collect(&:user)
+    notified.collect(&:mail)
+  end
+
   def initialize(attributes=nil, *args)
     super
 

app/views/admin/contest_page_made.html.erb

@@ -0,0 +1,39 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'contest_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'} %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'} %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} , :class => 'selected'%></li>
+      </ul>
+    </div>
+
+    <h4><%=l(:label_contest_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@contest_page} %>
+    </div>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='contest_title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'contest_title', params[:label_site_title], :value => @contest_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='contest_description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'contest_description',@contest_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/admin/course_page_made.html.erb

@@ -0,0 +1,37 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'course_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'} %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'}, :class => 'selected' %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} %></li>
+      </ul>
+    </div>
+    <h4><%=l(:label_course_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@course_page} %>
+    </div>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='course_title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'course_title', params[:label_site_title], :value => @course_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='course_description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'course_description',@course_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/admin/first_page_made.html.erb

@@ -0,0 +1,38 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'first_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'}, :class => 'selected' %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'} %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} %></li>
+      </ul>
+    </div>
+    <h4><%=l(:label_project_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+     </p>
+    <div style="margin-left: 82px;">
+        <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
+    </div>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+      <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/admin/project_page_made.html.erb

@@ -0,0 +1,31 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'first_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <h4><%=l(:label_project_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
+    </div>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/attachments/_form.html.erb

@@ -3,10 +3,10 @@
   <% container.attachments.each_with_index do |attachment, i| %>
     <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}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
           link_to('&nbsp;'.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"} %>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>

app/views/attachments/updateFileDense.js.erb

@@ -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%>);

app/views/avatar/_avatar_form.html.erb

@@ -45,6 +45,7 @@
 <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
 </a>
+  <!--         :accept => 'image/png,image/gif,image/jpeg', -->
 <span class="add_avatar" style="margin-left: -55px;width: 70px">
 	<%= file_field_tag 'avatar[image]',
       	:id => nil,
@@ -57,6 +58,8 @@
         	:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
         	:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
         	:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+            :file_type => Redmine::Configuration['pic_types'].to_s,
+            :type_support_message => l(:error_pic_type),
         	:upload_path => upload_avatar_path(:format => 'js'),
         	:description_placeholder => nil ,# l(:label_optional_description)
         	:source_type => source.class.to_s,

app/views/files/_course_file_dense_edit.html.erb

@@ -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 %>
+

app/views/files/_course_show_all_attachment.html.erb

@@ -18,6 +18,7 @@
     <%= 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('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('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
@@ -34,6 +35,9 @@
           </tr>
       <% end -%>
       <% container.attachments.each do |file| %>
+          <%if file.is_public == 0 && !User.current.member_of?(@project)%>
+              <%next%>
+          <%end%>
           <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="created_on"><%#= format_time(file.created_on) %></td> -->
@@ -45,6 +49,14 @@
               </span>
             </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>
+              &nbsp;
+      <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="digest" width="300px"><%= file.description %></td> -->
             <td align="center">

app/views/files/_course_sort_by_attachtypel.html.erb

@@ -5,66 +5,78 @@
 <% edit_allowed = User.current.allowed_to?(:manage_files, @course) %>
 <table class="list files" id="ver-zebra">
   <colgroup>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <!-- <col class="vzebra-odd"/> -->
-</colgroup>
-<thead>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <!-- <col class="vzebra-odd"/> -->
+  </colgroup>
+  <thead>
   <tr>
     <%= 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('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('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('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
-</thead>
-<tbody>
+  </thead>
+  <tbody>
   <% @containers.each do |container| %>
-  <% next if container.attachments.empty? -%>
-  <% container.attachments.each do |file| %>
-  <% if isTypeOk(file,selAttachType,selContentType) %>
-  <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="created_on"><%#= format_time(file.created_on) %></td> -->
-    <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-    <td class="attach_type">
-      <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
-      &nbsp;
+      <% next if container.attachments.empty? -%>
+      <% container.attachments.each do |file| %>
+          <% if file.is_public == 0 && !User.current.member_of?(@project) %>
+              <% next %>
+          <% end %>
+          <% if isTypeOk(file, selAttachType, selContentType) %>
+              <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="created_on"><%#= format_time(file.created_on) %></td> -->
+                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
+                <td class="attach_type">
+                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
+                  &nbsp;
       <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
         <%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes,
-          :attachment => file,:contentype=>selContentType} %>
+                                                                           :attachment => file, :contentype => selContentType} %>
         </span>
-      </td>
-      <td class="content_type"><%= file.show_suffix_type %></td>
-      <td class="downloads"><%= file.downloads %></td>
-      <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-      <td align="center">
-        <%= link_to(image_tag('delete.png'), attachment_path(file),
-        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
-      </td>
-    </tr>
-    <tr>
-      <td class='description' colspan="6">
-        <div class="tags_area">
-          <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-          <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
-          <div class="tags_gradint"></div>
-        </div>
-        <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-        </div>
-      </td>
-    </tr>
-    <% end -%>
-    <% end -%>
-    <% reset_cycle %>
-    <% end -%>
-    <!-- %= h downloadAll(@containers) % -->
-    <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
+                </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>
+                  &nbsp;
+      <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="digest" width="300px"><%= file.description %></td> -->
+                <td align="center">
+                  <%= link_to(image_tag('delete.png'), attachment_path(file),
+                              :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
+                </td>
+              </tr>
+              <tr>
+                <td class='description' colspan="6">
+                  <div class="tags_area">
+                    <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+                    <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
+                    <div class="tags_gradint"></div>
+                  </div>
+                  <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+                  </div>
+                </td>
+              </tr>
+          <% end -%>
+      <% end -%>
+      <% reset_cycle %>
+  <% end -%>
+  <!-- %= h downloadAll(@containers) % -->
+  <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
 
   </tbody>
 </table>

app/views/files/_project_file_dense_edit.html.erb

@@ -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 %>
+

app/views/files/_show_all_attachment.html.erb

@@ -18,6 +18,7 @@
     <%= 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('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('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
@@ -34,6 +35,9 @@
           </tr>
       <% end -%>
       <% container.attachments.each do |file| %>
+          <%if file.is_public == 0 && !User.current.member_of?(@project)%>
+          <%next%>
+          <%end%>
           <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="created_on"><%#= format_time(file.created_on) %></td> -->
@@ -45,6 +49,14 @@
               </span>
             </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>
+              &nbsp;
+      <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="digest" width="300px"><%= file.description %></td> -->
             <td align="center">

app/views/files/_sort_by_attachtypel.html.erb

@@ -5,66 +5,78 @@
 <% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <table class="list files" id="ver-zebra">
   <colgroup>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <col class="vzebra-odd"/>
-  <col class="vzebra-even"/>
-  <!-- <col class="vzebra-odd"/> -->
-</colgroup>
-<thead>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <col class="vzebra-odd"/>
+    <col class="vzebra-even"/>
+    <!-- <col class="vzebra-odd"/> -->
+  </colgroup>
+  <thead>
   <tr>
     <%= 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('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('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('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
-</thead>
-<tbody>
+  </thead>
+  <tbody>
   <% @containers.each do |container| %>
-  <% next if container.attachments.empty? -%>
-  <% container.attachments.each do |file| %>
-  <% if isTypeOk(file,selAttachType,selContentType) %>
-  <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="created_on"><%#= format_time(file.created_on) %></td> -->
-    <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-    <td class="attach_type">
-      <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
-      &nbsp;
+      <% next if container.attachments.empty? -%>
+      <% container.attachments.each do |file| %>
+          <% if file.is_public == 0 && !User.current.member_of?(@project) %>
+              <% next %>
+          <% end %>
+          <% if isTypeOk(file, selAttachType, selContentType) %>
+              <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="created_on"><%#= format_time(file.created_on) %></td> -->
+                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
+                <td class="attach_type">
+                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
+                  &nbsp;
       <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
         <%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes,
-          :attachment => file,:contentype=>selContentType} %>
+                                                                    :attachment => file, :contentype => selContentType} %>
         </span>
-      </td>
-      <td class="content_type"><%= file.show_suffix_type %></td>
-      <td class="downloads"><%= file.downloads %></td>
-      <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-      <td align="center">
-        <%= link_to(image_tag('delete.png'), attachment_path(file),
-        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
-      </td>
-    </tr>
-    <tr>
-      <td class='description' colspan="6">
-        <div class="tags_area">
-          <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-          <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
-          <div class="tags_gradint"></div>
-        </div>
-        <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-        </div>
-      </td>
-    </tr>
-    <% end -%>
-    <% end -%>
-    <% reset_cycle %>
-    <% end -%>
-    <!-- %= h downloadAll(@containers) % -->
-    <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
+                </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>
+                  &nbsp;
+      <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="digest" width="300px"><%= file.description %></td> -->
+                <td align="center">
+                  <%= link_to(image_tag('delete.png'), attachment_path(file),
+                              :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
+                </td>
+              </tr>
+              <tr>
+                <td class='description' colspan="6">
+                  <div class="tags_area">
+                    <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+                    <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
+                    <div class="tags_gradint"></div>
+                  </div>
+                  <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+                  </div>
+                </td>
+              </tr>
+          <% end -%>
+      <% end -%>
+      <% reset_cycle %>
+  <% end -%>
+  <!-- %= h downloadAll(@containers) % -->
+  <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
 
   </tbody>
 </table>