Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/boards_controller.rb

@@ -32,13 +32,17 @@ class BoardsController < ApplicationController
     #modify by nwb
     @flag = params[:flag] || false
     if @project
-      @boards = @project.boards.includes(:last_message => :author).all
-      @boards = [] << @boards[0] if @boards.any?
-      if @boards.size == 1
-        @board = @boards.first
-        show and return
+      if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+        render_403
+      else
+        @boards = @project.boards.includes(:last_message => :author).all
+        @boards = [] << @boards[0] if @boards.any?
+        if @boards.size == 1
+          @board = @boards.first
+          show and return
+        end
+        render :layout => false if request.xhr?
       end
-      render :layout => false if request.xhr?
     elsif @course
       if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
         @boards = @course.boards.includes(:last_message => :author).all

app/controllers/courses_controller.rb

@@ -342,10 +342,15 @@ class CoursesController < ApplicationController
 
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
+    filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
+    # 如果是ie11 需要转码
+    if(/rv\:11\.0/.match(request.env["HTTP_USER_AGENT"]) != nil)
+      filename= URI::encode(filename)
+    end
     respond_to do |format|
       format.xls {
         send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}.xls")
+                  :filename => "#{filename}.xls")
       }
     end
   end

app/controllers/files_controller.rb

@@ -23,7 +23,7 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:search_project,:quote_resource_show_project,:search_tag_attachment]
+  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
 
   helper :sort
   include SortHelper
@@ -46,6 +46,13 @@ class FilesController < ApplicationController
     @obj_attachments = paginateHelper @all_attachments,10
   end
 
+  def searchone4reload
+    attachment = Attachment.find_by_id(params[:fileid]);
+    respond_to do |format|
+      format.html{render :layout => nil,:locals=>{:file=>attachment,:course=>@course}}
+    end
+  end
+
   def search
     sort = ""
     @sort = ""

app/controllers/issues_controller.rb

@@ -84,15 +84,10 @@ class IssuesController < ApplicationController
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-                              :order => sort_clause,
-                              :offset => @offset,
-                              :limit => @limit)
+                                :order => sort_clause,
+                                :offset => @offset,
+                                :limit => @limit)
       @issue_count_by_group = @query.issue_count_by_group
-
-
-
-
-
       respond_to do |format|
         format.js
         format.html { render :template => 'issues/index', :layout =>  @project_base_tag }#by young

app/controllers/projects_controller.rb

@@ -31,7 +31,7 @@ class ProjectsController < ApplicationController
   before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
-  before_filter :file, :statistics, :watcherlist
+  before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
   before_filter :memberAccess, only: :member
 
@@ -417,10 +417,14 @@ class ProjectsController < ApplicationController
         @members = @project.member_principals.includes(:roles, :principal).all.sort
       end
     else
-      roles = Role.find_all_givable
-      @subPage_title = l :label_member_list
-      @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
-      @applied_members = appied_project_members(@project, @members)
+      if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+        render_403
+      else
+        roles = Role.find_all_givable
+        @subPage_title = l :label_member_list
+        @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
+        @applied_members = appied_project_members(@project, @members)
+      end
     end
     @members = paginateHelper @members
     render :layout => 'base_courses' if @project.project_type == 1
@@ -676,11 +680,13 @@ class ProjectsController < ApplicationController
     true
   end
 
-  # added by huang
-
   def watcherlist
-    if @watched
-       @users -= watched.watcher_users
+    unless @project.nil?
+      if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+        render_403
+      else
+        @users -= watched.watcher_users if  @watched
+      end
     end
   end
 

app/controllers/users_controller.rb

@@ -383,6 +383,8 @@ class UsersController < ApplicationController
       #   scope = User.logged.status(@status)
       #   @search_by = params[:search_by] ? params[:search_by][:id] : 0
       #   scope = scope.like(params[:name],@search_by) if params[:name].present?
+    @search_by = params[:search_by] ? params[:search_by] : 0
+
     us = UsersService.new
     scope = us.search_user params
     @user_count = scope.count

app/controllers/words_controller.rb

@@ -85,6 +85,9 @@ class WordsController < ApplicationController
     elsif @journal_destroyed.jour_type == "Course"
       @course = Course.find @journal_destroyed.jour_id
       @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
+    elsif @journal_destroyed.jour_type == "Principal"
+      @user = User.find(@journal_destroyed.jour_id)
+      @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
     end
     respond_to do |format|
       format.js

app/helpers/application_helper.rb

@@ -593,13 +593,38 @@ module ApplicationHelper
     Project.project_tree(projects, &block)
   end
 
+  # 项目版本库可见权限判断
+  # 条件：1、modules中设置不可见或项目没有版本库；2、如果项目是私有或者项目版本库隐藏则必须是项目成员才可见
+  def visible_repository?(project)
+    @result = false
+    unless project.enabled_modules.where("name = 'repository'").empty? || project.repositories.count == 0
+      if (project.hidden_repo || !project.is_public?)
+        if User.current.member_of?(project)
+          @result = true
+        end
+      else
+        @result = true
+      end
+    end
+    return @result
+  end
+
   # 判断当前用户是否为项目管理员
-  def is_project_manager?(user_id,project_id)
+  def is_project_manager?(user_id, project_id)
     @result = false
     mem = Member.where("user_id = ? and project_id = ?",user_id, project_id)
     unless mem.blank?
-      mem.first.roles.to_s.include?("Manager")
-      @result = false
+      @result = mem.first.roles.to_s.include?("Manager") ? true : false
+    end
+    return @result
+  end
+
+  # 公开项目资源可以引用，admin和管理员和资源上传者拥有设置公开私有权限
+  def authority_pubilic_for_files(project, file)
+    @result = false
+    if (is_project_manager?(User.current.id, @project.id) || file.author_id == User.current.id || User.current.admin) &&
+        project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
+      @result = true
     end
     return @result
   end

app/helpers/issues_helper.rb

@@ -67,29 +67,33 @@ module IssuesHelper
     s.html_safe
   end
 
-  #获取跟踪类型
-  #REDO:时间紧需要优化，两个方法可以综合成一个
+  #获取跟踪类型及样式
+  #REDO:时间紧可以优化.
   def get_issue_type(value)
+    issuetype = []
     if value == "缺陷" || value == 1
-      class_type = "red_btn_cir ml10"
+      issuetype << "red_btn_cir ml10"
+      issuetype << "缺陷"
     elsif value == "功能" || value == 2
-      class_type = "blue_btn_cir ml10"
+      issuetype << "blue_btn_cir ml10"
+      issuetype << "功能"
     elsif value == "支持" || value == 3
-      class_type = "green_btn_cir ml10"
+      issuetype << "green_btn_cir ml10"
+      issuetype << "支持"
+    elsif value == "任务" || value == 4
+      issuetype << "orange_btn_cir ml10"
+      issuetype << "任务"
     else
-      class_type = "orange_btn_cir ml10"
+      issuetype << "bgreen_btn_cir ml10"
+      issuetype << "周报"
     end
   end
 
-  def get_issue_typevalue(value)
-    if value == "缺陷" || value == 1
-      assign = "缺陷"
-    elsif value == "功能" || value == 2
-      assign = "功能"
-    elsif value == "支持" || value == 3
-      assign = "支持"
+  def principals_options_for_isuue_list(project)
+    if User.current.member_of?(project)
+      project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
     else
-      assign = "任务"
+      project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0])
     end
   end
 

app/services/users_service.rb

@@ -226,10 +226,18 @@ class UsersService
     }
     scope = User.logged.status(status)
     if params[:is_search_assitant].nil?
-      watcher = User.watched_by(params[:user_id])
-      watcher.push(params[:user_id])
+      #modify by yutao 2015/5/18 没有params[:user_id]参数时去掉"id not in (?)"条件(bug:#2270) start
+      #say by yutao: params[:user_id]这个是指谁发起的搜索么? 如果是 这个值貌似应该从session获取 怪怪的赶脚-_-!
       search_by = params[:search_by] ? params[:search_by] : "0"
-      scope = scope.where("id not in (?)",watcher).like(params[:name],search_by) if params[:name].present?
+      if params[:name].present?
+        if !params[:user_id].nil?
+          watcher = User.watched_by(params[:user_id])
+          watcher.push(params[:user_id])
+          scope = scope.where("id not in (?)",watcher)
+        end
+        scope = scope.like(params[:name],search_by)
+      end
+      #modify by yutao 2015/5/18 没有params[:user_id]参数时去掉"id not in (?)"条件 end
     else
       teachers = searchTeacherAndAssistant(Course.find(params[:course_id]))
       scope = scope.where("id not in (?)",teachers.map{|t| t.user_id}).like(params[:name],search_by) if params[:name].present?

app/views/attachments/_project_file_links.html.erb

@@ -28,7 +28,8 @@
 <div class="attachments" style="font-weight:normal;">
   <% is_float ||= false %>
   <% for attachment in attachments %>
-      <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+      <div style="float:left;">
+      <p style="height:14px;line-height:10px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
         <%if is_float%>
           <div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
       <% end%>
@@ -50,9 +51,10 @@
                       :id => attachment,
                       :filename => attachment.filename%>
       <% end %>
-      <span title="<%= attachment.description%>">
-    <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
-  </span>
+      </div>
+      <div style="float:left;max-width:220px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= attachment.description%>">
+    <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+  </div>
   <span class="size">(
     <%= number_to_human_size attachment.filesize %>)
   </span>

app/views/attachments/add_exist_file_to_courses.js.erb

@@ -4,4 +4,5 @@
  $("#error_show").html("<%= @message.html_safe %>");
 <% else %>
   closeModal();
+  searchone4reload('<%=params[:file_id]%>');
 <% end %>

app/views/files/_course_file.html.erb

@@ -1,4 +1,15 @@
 <script>
+    function searchone4reload(fileid){
+        var url = "<%= searchone4reload_course_files_path(@course)%>";
+        var data = {};data.fileid=fileid;
+        $.ajax({
+            url:url,dataType:'text',data:data,success:function(text){
+                var container_file_div = $("#container_files_"+fileid);
+                container_file_div.after(text);
+                container_file_div.remove();
+            }
+        });
+    }
     function show_upload(obj)
     {
         switch(obj)

app/views/files/_course_list.html.erb

@@ -1,66 +1,66 @@
 <% delete_allowed = User.current.allowed_to?(:manage_files, course) %>
 <div class="re_con_top">
   <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
-   <p class="f_r" style="color: #808080">
+  <p class="f_r" style="color: #808080">
     <% if order == "asc" %>
-         按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
-         <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
-         <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
     <% else %>
         按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
         <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
-         <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
     <% end %>
   </p>
 </div>
 <div class="cl"></div>
 
 <div class="files_tag" id="files_tag">
-    <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>
+  <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>
 </div>
 <div class="cl"></div>
 
 <div class="for_img_thumbnails">
-<% curse_attachments.each do |file| %>
-  <% if file.is_public? || User.current.member_of_course?(course) %>
-    <div class="re_con_box">
-      <div class="">
-        <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s,:class => "c_dblue f_14 f_b f_l hiddent" %>
-        <% if User.current.logged? %>
-          <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
-            <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
+  <% curse_attachments.each do |file| %>
+      <% if file.is_public? || User.current.member_of_course?(course) %>
+          <div class="re_con_box" id="container_files_<%= file.id %>">
+            <div class="">
+              <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s,:class => "c_dblue f_14 f_b f_l hiddent" %>
+              <% if User.current.logged? %>
+                  <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
+                      <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
 
-            <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
+                      <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
               <span id="is_public_<%= file.id %>">
                 <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
               </span>
-            <% else %>
-              <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
-            <% end %>
-          <% else %>
-           <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
-          <% end %>
-        <% else %>
-        <% end %>
-      </div>
-      <div class="cl"></div>
-      <div class="">
-        <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
-        <%= link_to( l(:button_delete), attachment_path(file),
-                     :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>
-        <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
-      </div>
-      <div class="cl"></div>
-      <div class="tag_h">
-        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
-        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
-      </div>
-      <div class="cl"></div>
-    </div><!---re_con_box end-->
-  <% else %>
-    <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
+                      <% else %>
+                          <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
+                      <% end %>
+                  <% else %>
+                      <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
+                  <% end %>
+              <% else %>
+              <% end %>
+            </div>
+            <div class="cl"></div>
+            <div class="">
+              <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+              <%= link_to( l(:button_delete), attachment_path(file),
+                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>
+              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+            </div>
+            <div class="cl"></div>
+            <div class="tag_h">
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+            </div>
+            <div class="cl"></div>
+          </div><!---re_con_box end-->
+      <% else %>
+          <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
+      <% end %>
   <% end %>
-<% end %>
 </div>
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>

app/views/files/_project_file_list.html.erb

@@ -20,14 +20,16 @@
         <div class="">
           <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %>
           <% if User.current.logged? %>
-              <%#--私有项目资源不能引用，不能设置公开私有--%>
-              <%#--公开项目资源可以应用，管理员和资源上传者拥有设置公开私有权限--%>
-                <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
-                <% if (is_project_manager?(User.current.id, @project.id) || file.author_id == User.current.id) && project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project" %>
+              <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
+                  <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
+              <% else %>
+                  <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
+              <% end %>
+              <% if authority_pubilic_for_files(project, file) %>
                     <span id="is_public_<%= file.id %>">
-                        <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
+                      <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
                     </span>
-                <% end %>
+              <% end %>
           <% end %>
         </div>
         <div class="cl"></div>

app/views/files/create.js.erb

@@ -27,6 +27,8 @@ $('#upload_file_div').slideToggle('slow');
   <%elsif  @course%>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
+    $("#courses_files_count_info").html("<%= @all_attachments.count%>");
+    $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);

app/views/files/searchone4reload.html.erb

@@ -0,0 +1,39 @@
+<% delete_allowed = User.current.allowed_to?(:manage_files, course) %>
+<% if file.is_public? || User.current.member_of_course?(course) %>
+    <div class="re_con_box" id="container_files_<%= file.id %>">
+      <div class="">
+        <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s,:class => "c_dblue f_14 f_b f_l hiddent" %>
+        <% if User.current.logged? %>
+            <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
+                <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
+
+                <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
+              <span id="is_public_<%= file.id %>">
+                <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
+              </span>
+                <% else %>
+                    <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
+                <% end %>
+            <% else %>
+                <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
+            <% end %>
+        <% else %>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+      <div class="">
+        <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+        <%= link_to( l(:button_delete), attachment_path(file),
+                     :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>
+        <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+      </div>
+      <div class="cl"></div>
+      <div class="tag_h">
+        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+      </div>
+      <div class="cl"></div>
+    </div><!---re_con_box end-->
+<% else %>
+    <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
+<% end %>

app/views/issues/_list.html.erb

@@ -12,7 +12,7 @@
                 <%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
                 <span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span>
               <div class="problem_tit_div fl">
-                <%=link_to "#{column_content[4]}<span class = '#{get_issue_type(column_content[1])}'>#{get_issue_typevalue(column_content[1])}</span>".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %>
+                <%=link_to "#{column_content[4]}<span class = '#{get_issue_type(column_content[1])[0]}'>#{get_issue_type(column_content[1])[1]}</span>".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %>
               </div>
               <div class="cl"></div>
                 <p>

app/views/issues/index.html.erb

@@ -39,7 +39,7 @@
           </div><!--problem_search end-->
 
           <div id="filter_form" class="fr" >
-            <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]),
+            <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
                         { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
                         },
                         {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"}
@@ -66,8 +66,8 @@
           </div><!--filter_form end-->
           <div class="cl"></div>
       <%# end %>
-      <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.count %></a>
-        <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').count  %> </a>
+      <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
+        <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count  %> </a>
       </p>
 
       <div class="cl"></div>

app/views/issues/index.js.erb

@@ -1 +1,3 @@
-$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
+$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
+$("#v_subject").focus();
+$("#v_subject").blur();

app/views/issues/new.html.erb

@@ -2,7 +2,6 @@
   <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
 </div>
 <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
-
 <%= labelled_form_for @issue, :url => project_issues_path(@project),
                       :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue' %>
@@ -16,7 +15,6 @@
     </a>
     <%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>
 <% end %>
-
 <div id="preview" class="wiki"></div>
 
 <% content_for :header_tags do %>

app/views/issues/show.html.erb

@@ -14,7 +14,7 @@
     <div class="talk_txt fl">
       <p class="pro_page_tit" style="word-break:break-all;">
         <%= @issue.subject %>
-        <span class='<%= "#{get_issue_type(@issue.tracker_id)}" %>'><%= get_issue_typevalue(@issue.tracker_id) %></span>
+        <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]}" %>'><%= get_issue_type(@issue.tracker_id)[1] %></span>
       </p><br/>
 
       <div class="cl"></div>

app/views/layouts/_base_development_group.html.erb

@@ -1,61 +0,0 @@
-<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
-  <div class="subNav">
-    <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
-    <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
-        <a  class="subnav_num">(<%= ForgeActivity.where("project_id = ?", @project.id).count %>)</a>
-    <% end %>
-  </div>
-  <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
-        <% unless @project.issues.count == 0 %>
-            <a class="subnav_num">(<%= @project.issues.count %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
-        <% end %>
-      </div>
-  <% end %>
-  <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
-        <% unless @project.boards.first.topics.count == 0 %>
-            <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post),  project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
-        <% end %>
-      </div>
-  <% end%>
-  <% unless @project.enabled_modules.where("name = 'files'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
-        <% unless attaments_num == 0 %>
-            <a  class="subnav_num">(<%= attaments_num  %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
-        <% end %>
-      </div>
-  <% end %>
-  <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
-  <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
-    <% if @project.hidden_repo || !@project.is_public? %>
-        <% if User.current.member_of?(@project) %>
-            <div class="subNav">
-                <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
-                <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
-            </div>
-        <% end %>
-    <% else %>
-         <div class="subNav">
-            <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
-            <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
-         </div>
-    <% end %>
-  <% end %>
-  <!-- more -->
-  <div class="subNav subNav_jiantou" onclick="$('#navContent').toggle(500);" id="expand_tools_expand"><%= l(:label_project_more) %></div>
-  <ul class="navContent" id="navContent">
-    <%= render 'projects/tools_expand' %>
-  </ul>

app/views/layouts/_base_friend_group.html.erb

@@ -1,29 +0,0 @@
-<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
-  <div class="subNav">
-    <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
-    <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
-        <a  class="subnav_num">(<%= ForgeActivity.where("project_id = ?", @project.id).count %>)</a>
-    <% end %>
-  </div>
-  <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
-        <% unless @project.boards.first.topics.count == 0 %>
-            <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
-        <% end %>
-      </div>
-  <% end%>
-  <% unless @project.enabled_modules.where("name = 'files'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
-        <% unless attaments_num == 0 %>
-            <a  class="subnav_num">(<%= attaments_num  %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
-        <% end %>
-      </div>
-  <% end %>

app/views/layouts/_base_research_team.html.erb

@@ -1,40 +0,0 @@
-<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
-  <div class="subNav">
-    <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
-    <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
-        <a  class="subnav_num">(<%= ForgeActivity.where("project_id = ?", @project.id).count %>)</a>
-    <% end %>
-  </div>
-  <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
-        <% unless @project.issues.count == 0 %>
-            <a class="subnav_num">(<%= @project.issues.count %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
-        <% end %>
-      </div>
-  <% end %>
-  <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
-        <% unless @project.boards.first.topics.count == 0 %>
-            <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post),  project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
-        <% end %>
-      </div>
-  <% end%>
-  <% unless @project.enabled_modules.where("name = 'files'").empty? %>
-      <div class="subNav">
-        <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
-        <% unless attaments_num == 0 %>
-            <a  class="subnav_num">(<%= attaments_num  %>)</a>
-        <% end %>
-        <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
-        <% end %>
-      </div>
-  <% end%>