From a35abf1f1f7257949a6d562357ba17673fcbfa27 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Wed, 20 May 2015 11:56:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2180:=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E8=B5=84=E6=BA=90=E5=BA=93=EF=BC=9A=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=B5=84=E6=BA=90=E5=90=8E=EF=BC=8C=E2=80=9C?=
 =?UTF-8?q?=E9=80=89=E4=BA=BA=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B=E2=80=9D?=
 =?UTF-8?q?=E6=9C=AA=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E9=80=89=E5=85=A5=E6=88=91=E7=9A=84=E5=85=B6=E4=BB=96=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb           |  9 +-
 .../add_exist_file_to_courses.js.erb          |  1 +
 app/views/files/_course_file.html.erb         | 11 +++
 app/views/files/_course_list.html.erb         | 82 +++++++++----------
 app/views/files/searchone4reload.html.erb     | 39 +++++++++
 config/routes.rb                              |  1 +
 6 files changed, 101 insertions(+), 42 deletions(-)
 create mode 100644 app/views/files/searchone4reload.html.erb

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 69e7105aa..aa2c9574b 100644
--- a/app/controllers/files_controller.rb
+++ b/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 = ""
diff --git a/app/views/attachments/add_exist_file_to_courses.js.erb b/app/views/attachments/add_exist_file_to_courses.js.erb
index eec1e255a..c84a89184 100644
--- a/app/views/attachments/add_exist_file_to_courses.js.erb
+++ b/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 %>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 1769b1a45..ebccfcaf4 100644
--- a/app/views/files/_course_file.html.erb
+++ b/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)
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 888910ac1..6039b543b 100644
--- a/app/views/files/_course_list.html.erb
+++ b/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%>
diff --git a/app/views/files/searchone4reload.html.erb b/app/views/files/searchone4reload.html.erb
new file mode 100644
index 000000000..4512e52dd
--- /dev/null
+++ b/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 %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index ae87c6a65..411386afc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -715,6 +715,7 @@ RedmineApp::Application.routes.draw do
       collection do
         match "getattachtype", :via =>  [:get, :post]
         match "search",:via => [:post,:get]
+        match "searchone4reload",:via => [:post,:get]
         match "search_tag_attachment", :via => [:post,:get]
       end
       member do

From 2dc81f354b73d33cc0e842281abd1f2f5152666b Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Wed, 20 May 2015 14:39:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2418:=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE--=E9=85=8D=E7=BD=AE=EF=BC=9A=E9=99=A4=E2=80=9C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E2=80=9D=E6=A8=A1=E5=9D=97=E4=B9=8B=E5=A4=96?=
 =?UTF-8?q?=E7=9A=84=E5=85=B6=E4=BB=96=E5=9B=9B=E4=B8=AA=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C=E5=90=8E?=
 =?UTF-8?q?=E4=BC=9A=E5=BE=88=E5=BF=AB=E5=9C=B0=E5=85=88=E8=BF=87=E6=B8=A1?=
 =?UTF-8?q?=E5=88=B0=E2=80=9C=E4=BF=A1=E6=81=AF=E2=80=9D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E8=BF=94=E5=9B=9E=E5=BD=93=E5=89=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb
index 25ec1c4d5..67b9d57ac 100644
--- a/app/views/projects/settings.html.erb
+++ b/app/views/projects/settings.html.erb
@@ -10,8 +10,8 @@
           project_setting(6);
           $("#pro_st_edit_ku").toggle();
           <%else%>
-
           <% end%>
+          $("div[nhname='pro_setting']").show();
       });
     <% end%>
 </script>
@@ -21,7 +21,7 @@
 </div>
 
 <!--通过admin界面配置，不同角色显示不同的模块-->
-<div class=" pro_setting">
+<div class=" pro_setting" nhname="pro_setting" style="display:none;">
   <div id="pro_st_tb_" class="pro_st_tb_">
     <ul>
       <% show_memu = show_project_memu User.current%>