From fa788ced1beeb5af8b6b01997da8ed8d35392eba Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 16 May 2016 15:00:08 +0800
Subject: [PATCH 01/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb      |  6 ++--
 .../users/_user_resource_tip_list.html.erb    |  1 +
 app/views/users/user_resource.html.erb        |  5 ++-
 public/stylesheets/org.css                    |  2 +-
 public/stylesheets/public.css                 | 34 +++++--------------
 5 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index b8551f7c5..57cc95c87 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -9,9 +9,11 @@
             <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
-          <li class="resource-list-name fl hidden">
-            <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack' %>
+          <li class="resource-list-name fl">
+            <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
+            <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
           </li>
+          <li class="resource-list-apply fr"><a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a></li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb
index 5d5876ac8..67fe292ee 100644
--- a/app/views/users/_user_resource_tip_list.html.erb
+++ b/app/views/users/_user_resource_tip_list.html.erb
@@ -1,6 +1,7 @@
 <ul class="resource-list-tab mt10" id="resource_tip_list">
   <li class="resource-list-checkbox fl"> </li>
   <li class="resource-list-name fl">资源名称</li>
+  <li class="resource-list-apply fr">操作</li>
   <li class="resource-list-time fr">
     <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
     <% if @order == "created_on" %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 80167db56..9420fa3ff 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -55,7 +55,10 @@
     <li class="fl resource-switch">
       <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
-    <li class="fl w770 border-bottom h34">&nbsp;</li>
+    <li class="fl resource-switch">
+      <a href="javascript:void(0);"  class="resource-tab" id="private_resource_list" data-remote="true">私有资源</a>
+    </li>
+    <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <div id="user_resource_type_filter">
         <%= render :partial => 'user_resource_type_filter' %>
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index abfeaef85..515865f28 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -109,7 +109,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
 .shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;}
 .sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; min-height:150px; padding-top:5px;}
-.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
+.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#ffffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
 .columnWrap li {padding-left:10px; color:#585858;}
 .columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;}
 .sectionRow:hover {background-color:#cccccc; cursor:pointer;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 643aea8cf..fcbd79e0b 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -185,6 +185,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .h150{ height:150px;}
 .p10 {padding-left:10px; padding-right:10px;}
 .mw220 {max-width: 220px !important;}
+.mw280 {max-width:280px !important;;}
 .mw360 {max-width: 360px !important;}
 .mw380 {max-width: 380px !important;}
 .mw400 {max-width: 400px !important;}
@@ -315,6 +316,7 @@ a:hover.orange_n_btn{background:#d63502;}
 .bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
 a.bgreen_n_btn{background:#1abc9c; padding:2px 10px; color:#fff;}
 a:hover.bgreen_n_btn{background:#08a384;}
+.green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 
 .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
@@ -1071,30 +1073,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;}
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 
-/*20160226新资源库*/
-.resource-wrapper {width:980px; padding:10px; border:1px solid #ddd; background-color:#fff; float:left;}
-.resource-list-tab {width:980px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
-.resource-list-checkbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
-.resource-checkbox {margin-top:14px; width:12px; height:12px;}
-.resource-list-name {width:380px; height:40px; line-height:40px; text-align:left;}
-.resource-list-from {width:150px; height:40px; line-height:40px; text-align:center;}
-.resource-list-size {width:60px; height:40px; line-height:40px; text-align:center;}
-.resource-list-type {width:80px; height:40px; line-height:40px; text-align:center;}
-.resource-list-uploader {width:80px; height:40px; line-height:40px; text-align:center;}
-.resource-list-time {width:70px; height:40px; line-height:40px; text-align:center;}
-.resource-list-quote {width:60px; height:40px; line-height:40px; text-align:center;}
-.resource-list-download {width:60px; height:40px; line-height:40px; text-align:center;}
-.resource-list {width:980px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto; cursor:pointer;}
-.resource-list:hover {background-color:#e1e1e1;}
-.resource-list-option {width:980px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
-.resource-check-all {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
-.border-bottom {border-bottom:1px solid #ddd;}
-.h34 {height:34px;}
-.resource-tab {font-size:16px; color:#4d4d4d; width:70px; padding:5px 10px; display:inline-block; text-align:left; border-bottom:1px solid #ddd;}
-a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px solid #269ac9;}
-.inactive-text {color:#888888 !important;}
-.inactive-border {border:1px solid #888888 !important;}
-
 /*导入资源样式*/
 .popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
 .resoure-list {width:705px;}
@@ -1121,11 +1099,11 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 .course-search {border: 1px solid #dddddd; height: 25px; width: 200px;outline: none;}
 
 /*20160226新资源库*/
-.resource-wrapper {width:980px; background-color:#fff; float:left;}
+.resource-wrapper {width:980px; padding:10px; border:1px solid #ddd; background-color:#fff; float:left;}
 .resource-list-tab {width:980px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
 .resource-list-checkbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
 .resource-checkbox {margin-top:14px; width:12px; height:12px;}
-.resource-list-name {width:380px; height:40px; line-height:40px; text-align:left;}
+.resource-list-name {width:310px; height:40px; line-height:40px; text-align:left;}
 .resource-list-from {width:150px; height:40px; line-height:40px; text-align:center;}
 .resource-list-size {width:80px; height:40px; line-height:40px; text-align:center;}
 .resource-list-type {width:80px; height:40px; line-height:40px; text-align:center;}
@@ -1133,6 +1111,8 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 .resource-list-time {width:70px; height:40px; line-height:40px; text-align:center;}
 .resource-list-quote {width:60px; height:40px; line-height:40px; text-align:center;}
 .resource-list-download {width:60px; height:40px; line-height:40px; text-align:center;}
+.resource-list-apply {width:70px; height:40px; line-height:40px; text-align:center;}
+.resource-list-middle {line-height:40px; vertical-align:middle; display:inline-block;}
 .resource-list {width:980px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto; cursor:pointer;}
 .resource-list:hover {background-color:#e1e1e1;}
 .resource-list-option {width:980px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
@@ -1141,6 +1121,8 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
 .h34 {height:34px;}
 .resource-tab {font-size:16px; color:#4d4d4d; width:70px; padding:5px 10px; display:inline-block; text-align:left; border-bottom:1px solid #ddd;}
 a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px solid #269ac9;}
+.inactive-text {color:#888888 !important;}
+.inactive-border {border:1px solid #888888 !important;}
 
 a.group-btn{  background: url(../images/course/hwork_icon.png) -2px -58px no-repeat !important; height:20px; display:block; padding-left:23px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repeat; width:30px; height:20px; display:block; padding-left:23px; color:#888888;}

From 545e4ac380087b6c8d9777706e6e256edb3e342f Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 17 May 2016 09:11:30 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E9=97=A8=E6=88=B7=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=BB=9A=E5=8A=A8=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1234567                              | 1 -
 app/views/layouts/base_org2.html.erb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 1234567

diff --git a/1234567 b/1234567
deleted file mode 100644
index 08de77ab4..000000000
--- a/1234567
+++ /dev/null
@@ -1 +0,0 @@
-{"access_token":"bFlabz0uBcoIBfWL7nBJkgpl26aOWDy-dyCOvH_MjUo_hMOOKG83WV1cCL1MG6H-AE-6eMI0iyLoOoAMv9Y3pFFsLYD-GAGr3UH9fT8OqeHMDlFhXyRTvHv9l2QPHGpcARUcCGANEH","expires_in":7200,"got_token_at":1462934760}
\ No newline at end of file
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 9b481fac5..91f57ee99 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -46,7 +46,7 @@
 
           scrollPic.speed          = 10; //移动速度(单位毫秒，越小越快)
           scrollPic.space          = 10; //每次移动像素(单位px，越大越快)
-          scrollPic.autoPlay       = true; //自动播放
+          scrollPic.autoPlay       = false; //自动播放
           scrollPic.autoPlayTime   = 3; //自动播放间隔时间(秒)
 
           scrollPic.initialize(); //初始化

From 4c066f9ad304ebb5968d3f8ab9133ccb5fbb9955 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 11:21:05 +0800
Subject: [PATCH 03/25] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ssos_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/ssos_controller.rb b/app/controllers/ssos_controller.rb
index 9f05fc19b..9a5042c50 100644
--- a/app/controllers/ssos_controller.rb
+++ b/app/controllers/ssos_controller.rb
@@ -27,8 +27,10 @@ class SsosController < ApplicationController
       ## 加入组织
       @organization = Organization.find(82)
       unless @organization.org_members.exists?(user_id: sso.user_id)
-        member = OrgMember.new(:user_id => sso.user_id)
+        member =  OrgMember.create(:user_id => sso.user_id, :created_at => Time.now)
+        # member = OrgMember.new(:user_id => sso.user_id)
         @organization.org_members << member
+        OrgMemberRole.create(:org_member_id => member.id, :role_id => 12)
       end
 
       ## 选择性跳转

From 4c71e525a7d4d28824bcd1dc83a23a2d58932c4e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 15:30:10 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=A2=9E=E5=8A=A0=E5=90=8E=EF=BC=8C=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_resource_info.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 58829386c..950dcd6f5 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -212,7 +212,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(6).html();
         if(user_id === '<%= User.current.id %>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();

From 07678e367e546b94f2e58fdb1b25dbe5906b3f58 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 15:32:18 +0800
Subject: [PATCH 05/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 57cc95c87..004cfee4d 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -178,7 +178,7 @@
         }
         line.children().css("background-color", 'white');
         id = line.children().last().html();
-        user_id = line.children().eq(5).html();
+        user_id = line.children().eq(6).html();
         if(line.children().first().children().data('hasHistory') == 'Y'){
             alert('该资源存在历史版本，不能删除');
             return;

From 615d0ddbd26ddd928d40bdf75090ce5a6599efca Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 17 May 2016 16:45:11 +0800
Subject: [PATCH 06/25] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E3=80=81=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=95=8C=E9=9D=A2=E5=8F=8A=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 004cfee4d..ebe111507 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,9 +11,17 @@
           </li>
           <li class="resource-list-name fl">
             <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
-            <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
+            <% if attach.is_public == 0  && @type == "6" %>
+                <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
+            <% end %>
+          </li>
+          <li class="resource-list-apply fr">
+            <% if attach.is_public == 0 && @type == "6" %>
+                <a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a>
+            <% else %>
+                --
+            <% end %>
           </li>
-          <li class="resource-list-apply fr"><a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a></li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>

From 658ea0cf1ecd9a50df74f32bced5c8cd1ce7d7c5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 18 May 2016 14:49:13 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=95=E7=94=A8=20?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=90=AD=E5=BB=BA=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/apply_resource.rb                  |  14 +
 app/models/attachment.rb                      |   6 +
 app/models/user.rb                            |   1 +
 app/views/users/_apply_for_resource.html.erb  |  16 +
 app/views/users/_apply_resource.html.erb      |  28 ++
 app/views/users/_resources_list.html.erb      |  15 +-
 app/views/users/apply_for_resource.js.erb     |  15 +
 app/views/users/apply_resource.js.erb         |  10 +
 app/views/users/user_resource.html.erb        |   2 +-
 config/routes.rb                              |   2 +
 .../20160517091224_create_apply_resources.rb  |  11 +
 ...0518031514_add_column_to_apply_resource.rb |   6 +
 ...43_add_column_content_to_apply_resource.rb |   6 +
 db/schema.rb                                  | 435 +++++++++++++++++-
 public/stylesheets/public.css                 |   3 +
 spec/factories/apply_resources.rb             |   8 +
 spec/models/apply_resource_spec.rb            |   5 +
 17 files changed, 557 insertions(+), 26 deletions(-)
 create mode 100644 app/models/apply_resource.rb
 create mode 100644 app/views/users/_apply_for_resource.html.erb
 create mode 100644 app/views/users/_apply_resource.html.erb
 create mode 100644 app/views/users/apply_for_resource.js.erb
 create mode 100644 app/views/users/apply_resource.js.erb
 create mode 100644 db/migrate/20160517091224_create_apply_resources.rb
 create mode 100644 db/migrate/20160518031514_add_column_to_apply_resource.rb
 create mode 100644 db/migrate/20160518060243_add_column_content_to_apply_resource.rb
 create mode 100644 spec/factories/apply_resources.rb
 create mode 100644 spec/models/apply_resource_spec.rb

diff --git a/app/models/apply_resource.rb b/app/models/apply_resource.rb
new file mode 100644
index 000000000..50fdeebcb
--- /dev/null
+++ b/app/models/apply_resource.rb
@@ -0,0 +1,14 @@
+class ApplyResource < ActiveRecord::Base
+  attr_accessible :attachment_id, :status, :user_id, :container_type, :container_id, :apply_user_id, :content
+  belongs_to :user
+  belongs_to :attachment
+  has_many :course_messages, :class_name => 'CourseMessage', :as => :course_message, :dependent => :destroy
+  after_create :act_as_apply_resource_message
+
+  def act_as_apply_resource_message
+    self.course_messages << CourseMessage.new(:user_id => self.user_id, :course_id => self.container_id, :viewed => false, :status => 5)
+    # REDO:发送邮件
+    # Mailer.run.apply_for_resource_request(self.container_id, User.current)
+  end
+
+end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index b3f5ce4ed..72205fdc5 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -35,6 +35,7 @@ class Attachment < ActiveRecord::Base
   # end
   include UserScoreHelper
   has_many :attachment_histories
+  has_many :apply_resources, :dependent => :destroy
 
   validates :filename, presence: true, length: {maximum: 254}
   validates :author, presence: true
@@ -536,6 +537,11 @@ class Attachment < ActiveRecord::Base
     end
   end
 
+  # 获取资源申请状态
+  def get_status_by_attach user_id
+    ApplyResource.where("user_id =? and attachment_id =?", user_id, self.id).first.try(:status)
+  end
+
   private
 
   # Physically deletes the file from the file system
diff --git a/app/models/user.rb b/app/models/user.rb
index 3956d936e..44ef54c95 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -109,6 +109,7 @@ class User < Principal
   has_many :student_works_scores, :dependent => :destroy
   has_many :student_work_projects, :dependent => :destroy
   has_many :apply_homeworks, :dependent => :destroy
+  has_many :apply_resources, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
diff --git a/app/views/users/_apply_for_resource.html.erb b/app/views/users/_apply_for_resource.html.erb
new file mode 100644
index 000000000..1a0df801b
--- /dev/null
+++ b/app/views/users/_apply_for_resource.html.erb
@@ -0,0 +1,16 @@
+<div>
+  <div class="ni_con">
+    <p class="mt30">
+      <% if state == 2 %>
+          请求已发送至<%= attachment.author.show_name %>，希望他同意与你分享：）
+      <% elsif state == 3 %>
+          您已发送过分享请求，请勿重复发送。
+      <% end %>
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="hideModal();" style="margin-bottom: 10px; margin-left: 60px; color: #fff;" >
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_apply_resource.html.erb b/app/views/users/_apply_resource.html.erb
new file mode 100644
index 000000000..2f5732030
--- /dev/null
+++ b/app/views/users/_apply_resource.html.erb
@@ -0,0 +1,28 @@
+<div>
+  <div class="ni_con">
+    <%= form_tag(apply_for_resource_user_path(:id => User.current.id, :attachment_id => attachment.id), :multipart => true, :remote => true, :name=>"apply_for_homework_form", :id=>'apply_for_homework_form') do %>
+        <h2>申请分享</h2>
+        <p style="color: #000;">
+          申请说明（必选）：
+          <textarea type="text" name="content" id="apply_content" placeholder="请附言，以增加分享的成功机率。" class="apply_content mt10" style="outline:none;"></textarea>
+        </p>
+        <span class="c_red ml5 f12" style="display: none" id="apply_content_notice">为增加分享的成功机率，请务必填写申请说明。</span>
+        <div class="ni_btn">
+          <a href="javascript:" class="tijiao" onclick="submit_apply_resource();" style="margin-bottom: 20px; margin-left: 60px; color: #fff">
+            确&nbsp;&nbsp;定
+          </a>
+        </div>
+    <% end %>
+  </div>
+</div>
+<script type="application/javascript">
+    var first_click_apply = true;
+    function submit_apply_resource(){
+        if($.trim($("#apply_content").val()) == ""){
+            $("#apply_content_notice").show();
+        } else if(first_click_apply) {
+            first_click_apply = false;
+            $('#apply_for_homework_form').submit();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index ebe111507..720fed133 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,13 +11,22 @@
           </li>
           <li class="resource-list-name fl">
             <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
-            <% if attach.is_public == 0  && @type == "6" %>
+            <% if attach.is_public == 0  && @type == "6" && attach.author != User.current %>
                 <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
             <% end %>
           </li>
           <li class="resource-list-apply fr">
-            <% if attach.is_public == 0 && @type == "6" %>
-                <a href="javascript:void(0);" class="green_btn_share c_white" data-remote="true">请求分享</a>
+            <% if attach.is_public == 0 && @type == "6" && attach.author != User.current %>
+                <% ah = attach.get_status_by_attach(attach.author_id) %>
+                <% if ah.nil? %>
+                    <%= link_to("请求分享", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %>
+                <% elsif ah.status == 1 %>
+                    等待回复
+                <% elsif ah.status == 2 %>
+                    可引用
+                <% elsif ah.status == 3 %>
+                    已拒绝
+                <% end %>
             <% else %>
                 --
             <% end %>
diff --git a/app/views/users/apply_for_resource.js.erb b/app/views/users/apply_for_resource.js.erb
new file mode 100644
index 000000000..c37632810
--- /dev/null
+++ b/app/views/users/apply_for_resource.js.erb
@@ -0,0 +1,15 @@
+<% if @state == 1 %>
+hideModal();
+alert("您还未登录，请先登录");
+<% elsif @state == 2 %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_for_resource', :locals => {:attachment => @attachment, :state => @state}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","50%").css("position","fixed").css("border","3px solid #269ac9");
+$("#homework_apply_status_<%= @attachment.id %>").html("等待回复");
+<% elsif @state == 3 %>
+hideModal();
+alert("您已申请过该资源");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/apply_resource.js.erb b/app/views/users/apply_resource.js.erb
new file mode 100644
index 000000000..62afcfd48
--- /dev/null
+++ b/app/views/users/apply_resource.js.erb
@@ -0,0 +1,10 @@
+<% if @state == 1 %>
+alert("您还未登录");
+<% elsif @state == 2 %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/apply_resource', :locals => {:attachment => @attachment}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 9420fa3ff..f7e239d97 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -56,7 +56,7 @@
       <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
     <li class="fl resource-switch">
-      <a href="javascript:void(0);"  class="resource-tab" id="private_resource_list" data-remote="true">私有资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">私有资源</a>
     </li>
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
diff --git a/config/routes.rb b/config/routes.rb
index 6554d1779..85e3198a3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -561,6 +561,7 @@ RedmineApp::Application.routes.draw do
       match 'apply_homework', :to => 'users#apply_homework', :via => :get
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
       match 'student_homeworks', :to => 'users#student_homeworks', :via => :get
+      get 'apply_resource'
       get 'user_import_homeworks'
       get 'user_search_homeworks'
       get 'choose_user_course'
@@ -630,6 +631,7 @@ RedmineApp::Application.routes.draw do
       get 'user_ref_homework_search'
       get 'show_homework_detail'
       post 'apply_for_homework'
+      post 'apply_for_resource'
       # end
     end
     #resources :blogs
diff --git a/db/migrate/20160517091224_create_apply_resources.rb b/db/migrate/20160517091224_create_apply_resources.rb
new file mode 100644
index 000000000..8e2516966
--- /dev/null
+++ b/db/migrate/20160517091224_create_apply_resources.rb
@@ -0,0 +1,11 @@
+class CreateApplyResources < ActiveRecord::Migration
+  def change
+    create_table :apply_resources do |t|
+      t.integer :status
+      t.integer :user_id
+      t.integer :attachment_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20160518031514_add_column_to_apply_resource.rb b/db/migrate/20160518031514_add_column_to_apply_resource.rb
new file mode 100644
index 000000000..164bad7b7
--- /dev/null
+++ b/db/migrate/20160518031514_add_column_to_apply_resource.rb
@@ -0,0 +1,6 @@
+class AddColumnToApplyResource < ActiveRecord::Migration
+  def change
+    add_column :apply_resources, :container_id, :integer
+    add_column :apply_resources, :container_type, :string
+  end
+end
diff --git a/db/migrate/20160518060243_add_column_content_to_apply_resource.rb b/db/migrate/20160518060243_add_column_content_to_apply_resource.rb
new file mode 100644
index 000000000..e741527e0
--- /dev/null
+++ b/db/migrate/20160518060243_add_column_content_to_apply_resource.rb
@@ -0,0 +1,6 @@
+class AddColumnContentToApplyResource < ActiveRecord::Migration
+  def change
+    add_column :apply_resources, :content, :text
+    add_column :apply_resources, :apply_user_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 092252062..58cb9b8ae 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160513120002) do
+ActiveRecord::Schema.define(:version => 20160518060243) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -52,6 +52,28 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
   add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
 
+  create_table "application_settings", :force => true do |t|
+    t.integer  "default_projects_limit"
+    t.boolean  "signup_enabled"
+    t.boolean  "signin_enabled"
+    t.boolean  "gravatar_enabled"
+    t.text     "sign_in_text"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "home_page_url"
+    t.integer  "default_branch_protection",    :default => 2
+    t.boolean  "twitter_sharing_enabled",      :default => true
+    t.text     "restricted_visibility_levels"
+    t.boolean  "version_check_enabled",        :default => true
+    t.integer  "max_attachment_size",          :default => 10,    :null => false
+    t.integer  "default_project_visibility"
+    t.integer  "default_snippet_visibility"
+    t.text     "restricted_signup_domains"
+    t.boolean  "user_oauth_applications",      :default => true
+    t.string   "after_sign_out_path"
+    t.integer  "session_expire_delay",         :default => 10080, :null => false
+  end
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -77,6 +99,18 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "apply_resources", :force => true do |t|
+    t.integer  "status"
+    t.integer  "user_id"
+    t.integer  "attachment_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+    t.integer  "container_id"
+    t.string   "container_type"
+    t.text     "content"
+    t.integer  "apply_user_id"
+  end
+
   create_table "at_messages", :force => true do |t|
     t.integer  "user_id"
     t.integer  "at_message_id"
@@ -144,6 +178,20 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.string  "typeName", :limit => 50
   end
 
+  create_table "audit_events", :force => true do |t|
+    t.integer  "author_id",   :null => false
+    t.string   "type",        :null => false
+    t.integer  "entity_id",   :null => false
+    t.string   "entity_type", :null => false
+    t.text     "details"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "audit_events", ["author_id"], :name => "index_audit_events_on_author_id"
+  add_index "audit_events", ["entity_id", "entity_type"], :name => "index_audit_events_on_entity_id_and_entity_type"
+  add_index "audit_events", ["type"], :name => "index_audit_events_on_type"
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -241,6 +289,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "broadcast_messages", :force => true do |t|
+    t.text     "message",    :null => false
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.integer  "alert_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "color"
+    t.string   "font"
+  end
+
   create_table "bug_to_osps", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "relative_memo_id"
@@ -540,6 +599,10 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "visits",                        :default => 0
   end
 
+  add_index "courses", ["id"], :name => "id", :unique => true
+  add_index "courses", ["tea_id"], :name => "tea_id"
+  add_index "courses", ["visits"], :name => "visits"
+
   create_table "custom_fields", :force => true do |t|
     t.string  "type",            :limit => 30, :default => "",    :null => false
     t.string  "name",            :limit => 30, :default => "",    :null => false
@@ -601,6 +664,15 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "deploy_keys_projects", :force => true do |t|
+    t.integer  "deploy_key_id", :null => false
+    t.integer  "project_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "deploy_keys_projects", ["project_id"], :name => "index_deploy_keys_projects_on_project_id"
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -650,6 +722,16 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "created_at"
   end
 
+  create_table "emails", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.string   "email",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "emails", ["email"], :name => "index_emails_on_email", :unique => true
+  add_index "emails", ["user_id"], :name => "index_emails_on_user_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -672,6 +754,25 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :force => true do |t|
+    t.string   "target_type"
+    t.integer  "target_id"
+    t.string   "title"
+    t.text     "data"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "action"
+    t.integer  "author_id"
+  end
+
+  add_index "events", ["action"], :name => "index_events_on_action"
+  add_index "events", ["author_id"], :name => "index_events_on_author_id"
+  add_index "events", ["created_at"], :name => "index_events_on_created_at"
+  add_index "events", ["project_id"], :name => "index_events_on_project_id"
+  add_index "events", ["target_id"], :name => "index_events_on_target_id"
+  add_index "events", ["target_type"], :name => "index_events_on_target_type"
+
   create_table "exercise_answers", :force => true do |t|
     t.integer  "user_id"
     t.integer  "exercise_question_id"
@@ -774,6 +875,15 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type"
   add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at"
 
+  create_table "forked_project_links", :force => true do |t|
+    t.integer  "forked_to_project_id",   :null => false
+    t.integer  "forked_from_project_id", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "forked_project_links", ["forked_to_project_id"], :name => "index_forked_project_links_on_forked_to_project_id", :unique => true
+
   create_table "forums", :force => true do |t|
     t.string   "name",                        :null => false
     t.text     "description"
@@ -903,6 +1013,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "identities", :force => true do |t|
+    t.string   "extern_uid"
+    t.string   "provider"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "identities", ["created_at", "id"], :name => "index_identities_on_created_at_and_id"
+  add_index "identities", ["user_id"], :name => "index_identities_on_user_id"
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1046,6 +1167,20 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "private",                     :default => 0
   end
 
+  create_table "keys", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "key"
+    t.string   "title"
+    t.string   "type"
+    t.string   "fingerprint"
+    t.boolean  "public",      :default => false, :null => false
+  end
+
+  add_index "keys", ["created_at", "id"], :name => "index_keys_on_created_at_and_id"
+  add_index "keys", ["user_id"], :name => "index_keys_on_user_id"
+
   create_table "kindeditor_assets", :force => true do |t|
     t.string   "asset"
     t.integer  "file_size"
@@ -1057,6 +1192,27 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "owner_type", :default => 0
   end
 
+  create_table "label_links", :force => true do |t|
+    t.integer  "label_id"
+    t.integer  "target_id"
+    t.string   "target_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_links", ["label_id"], :name => "index_label_links_on_label_id"
+  add_index "label_links", ["target_id", "target_type"], :name => "index_label_links_on_target_id_and_target_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "title"
+    t.string   "color"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labels", ["project_id"], :name => "index_labels_on_project_id"
+
   create_table "member_roles", :force => true do |t|
     t.integer "member_id",      :null => false
     t.integer "role_id",        :null => false
@@ -1107,23 +1263,47 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "viewed_count",  :default => 0
   end
 
-  create_table "mess", :id => false, :force => true do |t|
-    t.string   "课程名"
-    t.integer  "课程ID",                    :default => 0,  :null => false
-    t.string   "教师姓",                     :default => "", :null => false
-    t.string   "教师名",       :limit => 30, :default => "", :null => false
-    t.string   "主贴名",                     :default => "", :null => false
-    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
-    t.integer  "回帖对应主贴ID"
-    t.integer  "帖子点赞数"
-    t.integer  "主贴回复数",                   :default => 0,  :null => false
-    t.text     "主贴或回帖内容"
-    t.datetime "发帖时间",                                    :null => false
-    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
-    t.string   "发帖或回帖用户姓",                :default => "", :null => false
-    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
+  create_table "merge_request_diffs", :force => true do |t|
+    t.string   "state"
+    t.text     "st_commits",       :limit => 2147483647
+    t.text     "st_diffs",         :limit => 2147483647
+    t.integer  "merge_request_id",                       :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
+  add_index "merge_request_diffs", ["merge_request_id"], :name => "index_merge_request_diffs_on_merge_request_id", :unique => true
+
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "source_project_id",                :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "milestone_id"
+    t.string   "state"
+    t.string   "merge_status"
+    t.integer  "target_project_id",                :null => false
+    t.integer  "iid"
+    t.text     "description"
+    t.integer  "position",          :default => 0
+    t.datetime "locked_at"
+  end
+
+  add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
+  add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id"
+  add_index "merge_requests", ["created_at", "id"], :name => "index_merge_requests_on_created_at_and_id"
+  add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at"
+  add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id"
+  add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch"
+  add_index "merge_requests", ["source_project_id"], :name => "index_merge_requests_on_source_project_id"
+  add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch"
+  add_index "merge_requests", ["target_project_id", "iid"], :name => "index_merge_requests_on_target_project_id_and_iid", :unique => true
+  add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title"
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"
@@ -1158,6 +1338,39 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
+  create_table "milestones", :force => true do |t|
+    t.string   "title",       :null => false
+    t.integer  "project_id",  :null => false
+    t.text     "description"
+    t.date     "due_date"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "state"
+    t.integer  "iid"
+  end
+
+  add_index "milestones", ["created_at", "id"], :name => "index_milestones_on_created_at_and_id"
+  add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date"
+  add_index "milestones", ["project_id", "iid"], :name => "index_milestones_on_project_id_and_iid", :unique => true
+  add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
+
+  create_table "namespaces", :force => true do |t|
+    t.string   "name",                        :null => false
+    t.string   "path",                        :null => false
+    t.integer  "owner_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type"
+    t.string   "description", :default => "", :null => false
+    t.string   "avatar"
+  end
+
+  add_index "namespaces", ["created_at", "id"], :name => "index_namespaces_on_created_at_and_id"
+  add_index "namespaces", ["name"], :name => "index_namespaces_on_name", :unique => true
+  add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id"
+  add_index "namespaces", ["path"], :name => "index_namespaces_on_path", :unique => true
+  add_index "namespaces", ["type"], :name => "index_namespaces_on_type"
+
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",           :limit => 60, :default => "", :null => false
@@ -1183,6 +1396,31 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "notes", :force => true do |t|
+    t.text     "note"
+    t.string   "noteable_type"
+    t.integer  "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "project_id"
+    t.string   "attachment"
+    t.string   "line_code"
+    t.string   "commit_id"
+    t.integer  "noteable_id"
+    t.boolean  "system",                              :default => false, :null => false
+    t.text     "st_diff",       :limit => 2147483647
+  end
+
+  add_index "notes", ["author_id"], :name => "index_notes_on_author_id"
+  add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id"
+  add_index "notes", ["created_at", "id"], :name => "index_notes_on_created_at_and_id"
+  add_index "notes", ["created_at"], :name => "index_notes_on_created_at"
+  add_index "notes", ["noteable_id", "noteable_type"], :name => "index_notes_on_noteable_id_and_noteable_type"
+  add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type"
+  add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type"
+  add_index "notes", ["project_id"], :name => "index_notes_on_project_id"
+  add_index "notes", ["updated_at"], :name => "index_notes_on_updated_at"
+
   create_table "notificationcomments", :force => true do |t|
     t.string   "notificationcommented_type"
     t.integer  "notificationcommented_id"
@@ -1192,6 +1430,49 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",                 :null => false
   end
 
+  create_table "oauth_access_grants", :force => true do |t|
+    t.integer  "resource_owner_id", :null => false
+    t.integer  "application_id",    :null => false
+    t.string   "token",             :null => false
+    t.integer  "expires_in",        :null => false
+    t.text     "redirect_uri",      :null => false
+    t.datetime "created_at",        :null => false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+
+  create_table "oauth_access_tokens", :force => true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             :null => false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        :null => false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
+  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
+  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+
+  create_table "oauth_applications", :force => true do |t|
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.text     "redirect_uri",                 :null => false
+    t.string   "scopes",       :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
+  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+
   create_table "onclick_times", :force => true do |t|
     t.integer  "user_id"
     t.datetime "onclick_time"
@@ -1348,6 +1629,23 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "allow_teacher",        :default => 0
   end
 
+  create_table "permissions", :force => true do |t|
+    t.string  "controller",   :limit => 30, :default => "",    :null => false
+    t.string  "action",       :limit => 30, :default => "",    :null => false
+    t.string  "description",  :limit => 60, :default => "",    :null => false
+    t.boolean "is_public",                  :default => false, :null => false
+    t.integer "sort",                       :default => 0,     :null => false
+    t.boolean "mail_option",                :default => false, :null => false
+    t.boolean "mail_enabled",               :default => false, :null => false
+  end
+
+  create_table "permissions_roles", :id => false, :force => true do |t|
+    t.integer "permission_id", :default => 0, :null => false
+    t.integer "role_id",       :default => 0, :null => false
+  end
+
+  add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
+
   create_table "phone_app_versions", :force => true do |t|
     t.string   "version"
     t.text     "description"
@@ -1430,6 +1728,11 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "project_import_data", :force => true do |t|
+    t.integer "project_id"
+    t.text    "data"
+  end
+
   create_table "project_infos", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1519,6 +1822,16 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true
   add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id"
 
+  create_table "protected_branches", :force => true do |t|
+    t.integer  "project_id",                             :null => false
+    t.string   "name",                                   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "developers_can_push", :default => false, :null => false
+  end
+
+  add_index "protected_branches", ["project_id"], :name => "index_protected_branches_on_project_id"
+
   create_table "queries", :force => true do |t|
     t.integer "project_id"
     t.string  "name",          :default => "",    :null => false
@@ -1653,6 +1966,25 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "is_teacher_score",              :default => 0
   end
 
+  create_table "services", :force => true do |t|
+    t.string   "type"
+    t.string   "title"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "active",                :default => false, :null => false
+    t.text     "properties"
+    t.boolean  "template",              :default => false
+    t.boolean  "push_events",           :default => true
+    t.boolean  "issues_events",         :default => true
+    t.boolean  "merge_requests_events", :default => true
+    t.boolean  "tag_push_events",       :default => true
+    t.boolean  "note_events",           :default => true,  :null => false
+  end
+
+  add_index "services", ["created_at", "id"], :name => "index_services_on_created_at_and_id"
+  add_index "services", ["project_id"], :name => "index_services_on_project_id"
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -1691,6 +2023,26 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",     :null => false
   end
 
+  create_table "snippets", :force => true do |t|
+    t.string   "title"
+    t.text     "content",          :limit => 2147483647
+    t.integer  "author_id",                                             :null => false
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "file_name"
+    t.datetime "expires_at"
+    t.string   "type"
+    t.integer  "visibility_level",                       :default => 0, :null => false
+  end
+
+  add_index "snippets", ["author_id"], :name => "index_snippets_on_author_id"
+  add_index "snippets", ["created_at", "id"], :name => "index_snippets_on_created_at_and_id"
+  add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at"
+  add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at"
+  add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id"
+  add_index "snippets", ["visibility_level"], :name => "index_snippets_on_visibility_level"
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1763,9 +2115,9 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.integer  "absence_penalty",                               :default => 0
     t.float    "system_score",                                  :default => 0.0
     t.boolean  "is_test",                                       :default => false
+    t.float    "work_score"
     t.integer  "simi_id"
     t.integer  "simi_value"
-    t.float    "work_score"
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
@@ -1813,13 +2165,13 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
 
   create_table "sub_domains", :force => true do |t|
     t.integer  "org_subfield_id"
-    t.integer  "priority",        :default => 0
+    t.integer  "priority"
     t.string   "name"
     t.string   "field_type"
-    t.integer  "hide",            :default => 0
-    t.integer  "status",          :default => 0
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
+    t.integer  "hide"
+    t.integer  "status"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
   end
 
   create_table "subfield_subdomain_dirs", :force => true do |t|
@@ -1829,6 +2181,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "subscriptions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "subscribable_id"
+    t.string   "subscribable_type"
+    t.boolean  "subscribed"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], :name => "subscriptions_user_id_and_ref_fields", :unique => true
+
   create_table "system_messages", :force => true do |t|
     t.integer  "user_id"
     t.string   "content"
@@ -2068,6 +2431,17 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
   add_index "users", ["id", "type"], :name => "index_users_on_id_and_type"
   add_index "users", ["type"], :name => "index_users_on_type"
 
+  create_table "users_star_projects", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.integer  "user_id",    :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users_star_projects", ["project_id"], :name => "index_users_star_projects_on_project_id"
+  add_index "users_star_projects", ["user_id", "project_id"], :name => "index_users_star_projects_on_user_id_and_project_id", :unique => true
+  add_index "users_star_projects", ["user_id"], :name => "index_users_star_projects_on_user_id"
+
   create_table "versions", :force => true do |t|
     t.integer  "project_id",      :default => 0,      :null => false
     t.string   "name",            :default => "",     :null => false
@@ -2119,6 +2493,23 @@ ActiveRecord::Schema.define(:version => 20160513120002) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "type",                  :default => "ProjectHook"
+    t.integer  "service_id"
+    t.boolean  "push_events",           :default => true,          :null => false
+    t.boolean  "issues_events",         :default => false,         :null => false
+    t.boolean  "merge_requests_events", :default => false,         :null => false
+    t.boolean  "tag_push_events",       :default => false
+    t.boolean  "note_events",           :default => false,         :null => false
+  end
+
+  add_index "web_hooks", ["created_at", "id"], :name => "index_web_hooks_on_created_at_and_id"
+  add_index "web_hooks", ["project_id"], :name => "index_web_hooks_on_project_id"
+
   create_table "wechat_logs", :force => true do |t|
     t.string   "openid",       :null => false
     t.text     "request_raw"
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index fcbd79e0b..8489b0fa1 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1134,3 +1134,6 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 
 .likeText{color: #7f7f7f}
 .likeNum{color: #7f7f7f}
+
+/*弹框*/
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
\ No newline at end of file
diff --git a/spec/factories/apply_resources.rb b/spec/factories/apply_resources.rb
new file mode 100644
index 000000000..92e48632b
--- /dev/null
+++ b/spec/factories/apply_resources.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :apply_resource do
+    status 1
+user_id 1
+attachment_id 1
+  end
+
+end
diff --git a/spec/models/apply_resource_spec.rb b/spec/models/apply_resource_spec.rb
new file mode 100644
index 000000000..a0d4b48b1
--- /dev/null
+++ b/spec/models/apply_resource_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ApplyResource, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From f3f75a57bdad2096e33b521479061efd4b31b39f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 18 May 2016 17:37:48 +0800
Subject: [PATCH 08/25] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=B5=84=E6=BA=90=E5=8F=91=E5=B8=83=E8=BF=99?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 101 ++++++++++++++++--
 app/models/apply_resource.rb                  |   3 +-
 .../_apply_resource_course_message.html.erb   |  29 +++++
 app/views/users/_resources_list.html.erb      |  10 +-
 app/views/users/_user_message_course.html.erb |   6 ++
 .../users/_user_resource_type_filter.html.erb |   2 +-
 app/views/users/apply_for_resource.js.erb     |   2 +-
 7 files changed, 136 insertions(+), 17 deletions(-)
 create mode 100644 app/views/users/_apply_resource_course_message.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index dd1d8f876..b6fed88af 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -311,6 +311,30 @@ class UsersController < ApplicationController
     end
   end
 
+  # 处理资源引用请求
+  # status
+  def deal_with_apply_resource
+    @msg = CourseMessage.find(params[:msg_id])
+    ah = ApplyHomework.where("user_id = ? and homework_common_id = ?",@msg.apply_user_id, @msg.course_message_id)
+    case params[:agree]
+      when 'Y'
+        unless ah.empty?
+          ah.first.update_column('status', 2)
+          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>1)
+          @msg.update_attributes(:apply_result=>1,:viewed=>1)
+        end
+      when 'N'
+        unless ah.empty?
+          ah.first.update_column('status', 3)
+          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>2)
+          @msg.update_attributes(:apply_result=>2,:viewed=>1)
+        end
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #处理引用作业的请求
   #status 1 同意 2 拒绝
   def dealwith_apply_homework
@@ -419,6 +443,19 @@ class UsersController < ApplicationController
   end
   # end
 
+  # 资源分享请求弹框
+  def apply_resource
+    if User.current.logged?
+      @attachment = Attachment.find params[:attachment_id]
+      @state = 2
+    else
+      @state = 1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #引用作业请求弹框
   def apply_homework
     if User.current.logged?
@@ -432,6 +469,27 @@ class UsersController < ApplicationController
     end
   end
 
+  # 申请引用资源
+  def apply_for_resource
+    if User.current.logged?
+      @attachment = Attachment.where("id =?", params[:attachment_id].to_i).first
+      unless @attachment.nil?
+        ar = ApplyResource.where("user_id = ? and attachment_id = ?", User.current.id, params[:attacment_id].to_i)
+        if ar.empty?
+          ApplyResource.create(:user_id => params[:id].to_i, :attachment_id => params[:attachment_id].to_i, :status => true, :container_id => @attachment.container_id, :container_type => @attachment.container_type, :content => params[:content], :apply_user_id => @attachment.author_id)
+          @state = 2
+        else
+          @state = 3
+        end
+      end
+    else
+      @state = 1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #申请引用非公开作业
   def apply_for_homework
     if User.current.logged?
@@ -2608,7 +2666,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids, order, score
-    attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源搜索
@@ -2637,6 +2695,17 @@ class UsersController < ApplicationController
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取我的私有资源分享结果
+  def get_my_private_resources apply_ids, resource_type, order, score
+    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的私有资源分享结果
+  def get_course_private_resources author_id, user_course_ids, order, score
+    apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
+    attachments = Attachment.where("user_id =? and attachment_id =?")
+  end
+
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
     attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
@@ -2646,12 +2715,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源中课程资源
   def get_course_resources_public user_course_ids, order, score
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中课程资源搜索结果
   def get_course_resources_public_search user_course_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的项目资源
@@ -2670,12 +2739,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
-    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源的项目资源搜索
   def get_project_resources_public_search  user_project_ids, order, score, search
-    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我上传的附件
@@ -2693,13 +2762,13 @@ class UsersController < ApplicationController
   # 获取公共资源中我上传的附件
   def get_attch_resources_public order, score
     attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public_search order, score, search
     attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
-                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2714,12 +2783,12 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public order, score
-    attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Principal'and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
   def get_principal_resources_public_search order, score, search
-    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2761,6 +2830,20 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2" # 私有资源
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      # apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/models/apply_resource.rb b/app/models/apply_resource.rb
index 50fdeebcb..ac65c0e3d 100644
--- a/app/models/apply_resource.rb
+++ b/app/models/apply_resource.rb
@@ -1,4 +1,5 @@
 class ApplyResource < ActiveRecord::Base
+  # status：1. 等待回复 2.审核通过 3.已拒绝
   attr_accessible :attachment_id, :status, :user_id, :container_type, :container_id, :apply_user_id, :content
   belongs_to :user
   belongs_to :attachment
@@ -6,7 +7,7 @@ class ApplyResource < ActiveRecord::Base
   after_create :act_as_apply_resource_message
 
   def act_as_apply_resource_message
-    self.course_messages << CourseMessage.new(:user_id => self.user_id, :course_id => self.container_id, :viewed => false, :status => 5)
+    self.course_messages << CourseMessage.new(:user_id => self.apply_user_id, :course_id => self.container_id, :viewed => false, :status => 5)
     # REDO:发送邮件
     # Mailer.run.apply_for_resource_request(self.container_id, User.current)
   end
diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
new file mode 100644
index 000000000..154ae3172
--- /dev/null
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -0,0 +1,29 @@
+<li class="homepageNewsPortrait fl">
+  <div class="navHomepageLogo fl">
+    <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
+  </div>
+</li>
+<li class="homepageNewsPubType fl">
+  <%= link_to ma.course_message.user.show_name, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+  <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">申请引用资源：</span>
+</li>
+<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
+  <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
+  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>
+  </a>
+</li>
+
+<li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
+   <span id="deal_info_<%=ma.id%>">
+     <% if ma.apply_result == 0 || ma.apply_result.nil?%>
+         <%= link_to '同意', dealwith_apply_homework_user_path(User.current,:agree => 'Y', :msg_id => ma.id), :remote => 'true' %> |
+         <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree => 'N', :msg_id => ma.id), :remote => 'true' %>
+     <% elsif ma.apply_result == 1 %>
+         您已经同意了该申请
+     <% elsif ma.apply_result == 2 %>
+         您已经拒绝了该申请
+     <%end %>
+   </span>
+</li>
+<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
\ No newline at end of file
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 720fed133..18d20cd60 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -15,16 +15,16 @@
                 <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
             <% end %>
           </li>
-          <li class="resource-list-apply fr">
+          <li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
             <% if attach.is_public == 0 && @type == "6" && attach.author != User.current %>
-                <% ah = attach.get_status_by_attach(attach.author_id) %>
+                <% ah = attach.get_status_by_attach(User.current.id) %>
                 <% if ah.nil? %>
                     <%= link_to("请求分享", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %>
-                <% elsif ah.status == 1 %>
+                <% elsif ah == 1 %>
                     等待回复
-                <% elsif ah.status == 2 %>
+                <% elsif ah == 2 %>
                     可引用
-                <% elsif ah.status == 3 %>
+                <% elsif ah == 3 %>
                     已拒绝
                 <% end %>
             <% else %>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index d278c7d74..9befe2b0b 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -234,6 +234,12 @@
           <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %>
         </ul>
     <% end %>
+    <!--资源申请-->
+    <% if ma.course_message_type == "ApplyResource" %>
+        <ul class="homepageNewsList fl" id="course_message_homework_<%=ma.id %>">
+          <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
+        </ul>
+    <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), width: "30px", height: "30px", class: "mt3") %></div></a></li>
diff --git a/app/views/users/_user_resource_type_filter.html.erb b/app/views/users/_user_resource_type_filter.html.erb
index 6e5ed51c3..d2aa29eed 100644
--- a/app/views/users/_user_resource_type_filter.html.erb
+++ b/app/views/users/_user_resource_type_filter.html.erb
@@ -17,7 +17,7 @@
         <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
       </li>
       <div id="my_files_resource">
-        <% if @type != "6" %>
+        <% unless (@type == "6" || @type == "2") %>
             <li>
               <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 4, :search => @switch_search) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
               <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
diff --git a/app/views/users/apply_for_resource.js.erb b/app/views/users/apply_for_resource.js.erb
index c37632810..10dd326e8 100644
--- a/app/views/users/apply_for_resource.js.erb
+++ b/app/views/users/apply_for_resource.js.erb
@@ -8,7 +8,7 @@ $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
 $('#ajax-modal').parent().css("top","30%").css("left","50%").css("position","fixed").css("border","3px solid #269ac9");
-$("#homework_apply_status_<%= @attachment.id %>").html("等待回复");
+$("#resource_apply_status_<%= @attachment.id %>").html("等待回复");
 <% elsif @state == 3 %>
 hideModal();
 alert("您已申请过该资源");

From 99cbf0b54ef3058c79b1d303374573af0c48ecfd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 11:32:58 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 26 +++++++++----------
 app/models/apply_resource.rb                  |  6 ++++-
 app/models/course_message.rb                  |  2 ++
 .../_apply_resource_course_message.html.erb   | 12 ++++-----
 ...ply_resource_course_message_reply.html.erb | 21 +++++++++++++++
 app/views/users/_user_message_course.html.erb | 10 +++++--
 .../users/deal_with_apply_resource.js.erb     |  1 +
 app/views/users/user_resource.html.erb        |  2 +-
 config/routes.rb                              |  1 +
 9 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 app/views/users/_apply_resource_course_message_reply.html.erb
 create mode 100644 app/views/users/deal_with_apply_resource.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b6fed88af..7542ef3ee 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -315,20 +315,18 @@ class UsersController < ApplicationController
   # status
   def deal_with_apply_resource
     @msg = CourseMessage.find(params[:msg_id])
-    ah = ApplyHomework.where("user_id = ? and homework_common_id = ?",@msg.apply_user_id, @msg.course_message_id)
-    case params[:agree]
-      when 'Y'
-        unless ah.empty?
-          ah.first.update_column('status', 2)
-          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>1)
-          @msg.update_attributes(:apply_result=>1,:viewed=>1)
-        end
-      when 'N'
-        unless ah.empty?
-          ah.first.update_column('status', 3)
-          CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>2)
-          @msg.update_attributes(:apply_result=>2,:viewed=>1)
-        end
+    ar = ApplyResource.where("id = ?", @msg.course_message_id).first
+    unless ar.nil?
+      case params[:agree]
+        when 'Y'
+          ar.update_column('status', 2)
+           @msg.update_attributes(:apply_result => 1, :viewed => 1)
+          ar.course_messages << CourseMessage.new(:user_id => ar.user_id, :course_id => -1, :viewed => false, :apply_result => 2, :status => 1)
+        when 'N'
+          ar.update_column('status', 3)
+          @msg.update_attributes(:apply_result => 2, :viewed => 1)
+          ar.course_messages << CourseMessage.new(:user_id => ar.user_id, :course_id => -1, :viewed => false, :apply_result => 3, :status => 1)
+      end
     end
     respond_to do |format|
       format.js
diff --git a/app/models/apply_resource.rb b/app/models/apply_resource.rb
index ac65c0e3d..df646166c 100644
--- a/app/models/apply_resource.rb
+++ b/app/models/apply_resource.rb
@@ -7,9 +7,13 @@ class ApplyResource < ActiveRecord::Base
   after_create :act_as_apply_resource_message
 
   def act_as_apply_resource_message
-    self.course_messages << CourseMessage.new(:user_id => self.apply_user_id, :course_id => self.container_id, :viewed => false, :status => 5)
+    self.course_messages << CourseMessage.new(:user_id => self.apply_user_id, :course_id => -1, :viewed => false, :status => 0, )
     # REDO:发送邮件
     # Mailer.run.apply_for_resource_request(self.container_id, User.current)
   end
 
+  def find_attachment attachment_id
+    Attachment.find(attachment_id)
+  end
+
 end
diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index 703da936b..59fcfe456 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -1,5 +1,7 @@
 class CourseMessage < ActiveRecord::Base
   # status说明： status在课程不同的类型，区分不同的功能 status = 9 作品的提交记录
+  # ApplyResource status:
+  # 0: 发送申请 1：回复允许申请 2：拒绝申请消息
   # HomeworkCommon：status：
   # nil：发布了作业； 1：作业截止时间到了提醒！；2:开启匿评； 3：关闭匿评； 4：匿评开始失败； 5：申请引用作业, 6:申请结果
   # apply_user_id: 申请者的用户id
diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 154ae3172..55dcb4d22 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -9,16 +9,16 @@
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.attachment.try(:name)}"+"\"#{content}" %>
+  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>
   </a>
 </li>
 
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
-   <span id="deal_info_<%=ma.id%>">
-     <% if ma.apply_result == 0 || ma.apply_result.nil?%>
-         <%= link_to '同意', dealwith_apply_homework_user_path(User.current,:agree => 'Y', :msg_id => ma.id), :remote => 'true' %> |
-         <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree => 'N', :msg_id => ma.id), :remote => 'true' %>
+   <span id="deal_info_<%= ma.id %>">
+     <% if ma.apply_result == 0 || ma.apply_result.nil? %>
+         <%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
+         <%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
      <% elsif ma.apply_result == 1 %>
          您已经同意了该申请
      <% elsif ma.apply_result == 2 %>
diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb
new file mode 100644
index 000000000..4869c4393
--- /dev/null
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -0,0 +1,21 @@
+<ul class="homepageNewsList fl">
+  <li class="homepageNewsPortrait fl">
+    <% owner = User.find(ma.course_message.apply_user_id) %>
+    <div class="navHomepageLogo fl">
+      <%= link_to image_tag(url_to_avatar(owner), :width => "30", :height => "30", class: "mt3"), user_path(owner) %>
+    </div>
+  </li>
+  <li class="homepageNewsPubType fl">
+    <%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %>
+    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用资源：</span>
+  </li>
+  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+    <% link_str = ma.apply_result == 1 ?
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请已通过'
+    :
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请被婉拒' %>
+    <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  </a>
+  </li>
+  <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+</ul>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 9befe2b0b..8e3aa4873 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -235,11 +235,17 @@
         </ul>
     <% end %>
     <!--资源申请-->
-    <% if ma.course_message_type == "ApplyResource" %>
-        <ul class="homepageNewsList fl" id="course_message_homework_<%=ma.id %>">
+    <% if ma.course_message_type == "ApplyResource" && ma.status == 0 %>
+        <ul class="homepageNewsList fl" id="apply_resource_message_<%=ma.id %>">
           <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
         </ul>
     <% end %>
+    <!--资源申请回复-->
+    <% if ma.course_message_type == "ApplyResource" && ma.status == 1 %>
+        <ul class="homepageNewsList fl" id="apply_resource_message_<%=ma.id %>">
+          <%= render :partial => 'apply_resource_course_message_reply', :locals => {:ma => ma} %>
+        </ul>
+    <% end %>
     <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), width: "30px", height: "30px", class: "mt3") %></div></a></li>
diff --git a/app/views/users/deal_with_apply_resource.js.erb b/app/views/users/deal_with_apply_resource.js.erb
new file mode 100644
index 000000000..dbf07217c
--- /dev/null
+++ b/app/views/users/deal_with_apply_resource.js.erb
@@ -0,0 +1 @@
+$("#apply_resource_message_<%= @msg.id %>").html('<%= escape_javascript(render :partial => 'users/apply_resource_course_message', :locals => {:ma => @msg}) %>');
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index f7e239d97..0bd5724c1 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -56,7 +56,7 @@
       <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
     <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">私有资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '2', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">私有资源</a>
     </li>
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
diff --git a/config/routes.rb b/config/routes.rb
index 85e3198a3..98d90c753 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -623,6 +623,7 @@ RedmineApp::Application.routes.draw do
       post 'import_resources_to_homework'
       get 'dealwith_apply_request'
       get 'dealwith_apply_homework'
+      get 'deal_with_apply_resource'
       get 'store_selected_resource'
       get 'user_organizations'
       get 'search_user_orgs'

From bddc807057f7cf0de8a570be89b4fa0b85b159be Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 13:41:32 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E5=BC=B9=E6=A1=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/apply_for_resource.js.erb | 2 +-
 app/views/users/apply_resource.js.erb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/apply_for_resource.js.erb b/app/views/users/apply_for_resource.js.erb
index 10dd326e8..7debbcba2 100644
--- a/app/views/users/apply_for_resource.js.erb
+++ b/app/views/users/apply_for_resource.js.erb
@@ -7,7 +7,7 @@ showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","30%").css("left","50%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().css("top","30%").css("left","37%").css("position","fixed").css("border","3px solid #269ac9");
 $("#resource_apply_status_<%= @attachment.id %>").html("等待回复");
 <% elsif @state == 3 %>
 hideModal();
diff --git a/app/views/users/apply_resource.js.erb b/app/views/users/apply_resource.js.erb
index 62afcfd48..14a795fe5 100644
--- a/app/views/users/apply_resource.js.erb
+++ b/app/views/users/apply_resource.js.erb
@@ -6,5 +6,5 @@ showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().css("top","30%").css("left","37%").css("position","fixed").css("border","3px solid #269ac9");
 <% end %>
\ No newline at end of file

From 4c68da9beeeb233fdfcfc5c8227ee5cf9ab4b55b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 13:49:29 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_apply_resource_course_message.html.erb       | 4 ++--
 app/views/users/_apply_resource_course_message_reply.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 55dcb4d22..4dbec8127 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -9,8 +9,8 @@
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.user.try(:name)}"+"\"#{content}" %>
+  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
   </a>
 </li>
 
diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb
index 4869c4393..7cf246c53 100644
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -11,9 +11,9 @@
   </li>
   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
     <% link_str = ma.apply_result == 1 ?
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请已通过'
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
     :
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.apply_user_id).try(:filename) + '"的申请被婉拒' %>
+            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
     <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
   </a>
   </li>

From 0b2f6c9a53a3d3134ae2b1add26f2b015a62f529 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 14:28:13 +0800
Subject: [PATCH 12/25] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E5=92=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb      | 22 ++++++++++++++++------
 app/views/users/_resources_list.html.erb |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7542ef3ee..b0194a2d8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2698,10 +2698,9 @@ class UsersController < ApplicationController
     attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取我的私有资源分享结果
-  def get_course_private_resources author_id, user_course_ids, order, score
-    apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
-    attachments = Attachment.where("user_id =? and attachment_id =?")
+  # 获取我的私有资源分享搜索结果
+  def get_my_private_resources_search apply_ids, resource_type, order, score, search
+    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的课程资源中搜索结果
@@ -2830,7 +2829,6 @@ class UsersController < ApplicationController
       end
     elsif params[:type] == "2" # 私有资源
       apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      # apply_id = ApplyResource.where("user_id =?", author_id).map{|ar| ar.attachment_id}
       if params[:status] == "2"
         resource_type = "'Course'"
       elsif params[:status] == "3"
@@ -2838,7 +2836,6 @@ class UsersController < ApplicationController
       elsif params[:status] == "5"
         resource_type = "'Principal'"
       else
-        # 公共资源库：所有公开资源或者我上传的私有资源
         resource_type = "'Project','OrgSubfield','Principal','Course'"
       end
       @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
@@ -3022,6 +3019,19 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
       @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
+    elsif params[:type] == "2" # 私有资源
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
+      @attachments
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 18d20cd60..63ef92667 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -11,7 +11,7 @@
           </li>
           <li class="resource-list-name fl">
             <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
-            <% if attach.is_public == 0  && @type == "6" && attach.author != User.current %>
+            <% if attach.is_public == 0  && (@type == "6" || @type == "2") && attach.author != User.current %>
                 <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
             <% end %>
           </li>

From 984f7067224510d98040d490d78d6cc838a46eb4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 15:59:59 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E5=8F=AF=E5=8F=91=E9=80=81=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/attachment.rb                 |  5 ++++
 app/views/users/_resources_list.html.erb | 34 +++++++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 72205fdc5..b7ec264fd 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -140,6 +140,11 @@ class Attachment < ActiveRecord::Base
         }
     )
   end
+
+  def get_apply_resource_status attachment_id, author_id
+    ApplyResource.where("attachment_id =? and apply_user_id =?", attachment_id, author_id).first.try(:status)
+  end
+
   # add by nwb
   # 公开的项目id列表
   def self.public_project_id
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 63ef92667..252798227 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -16,7 +16,7 @@
             <% end %>
           </li>
           <li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
-            <% if attach.is_public == 0 && @type == "6" && attach.author != User.current %>
+            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
                 <% ah = attach.get_status_by_attach(User.current.id) %>
                 <% if ah.nil? %>
                     <%= link_to("请求分享", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %>
@@ -39,6 +39,8 @@
           <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
+          <li style="display: none"><%= attach.is_public %></li>
+          <li style="display: none"><%= attach.get_apply_resource_status(attach.id, attach.author_id) %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -87,19 +89,27 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id) %>' + "?send_id=" + id + "&type=<%= @type %>",
-                data:{send_type:'file'}
-            });
+        is_public = line.children().eq(11).html();
+        user_id = line.children().eq(6).html();
+        apply_status = line.children().eq(12).html();
+        if(is_public == 0 && user_id != '<%= User.current.id %>' && apply_status != 2){
+            alert('您无权发送私有资源')
         }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + "?send_id=" + id + "&type=<%= @type %>",
-                data:{send_type:'file'}
-            });
+            if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+                $.ajax({
+                    type: 'get',
+                    url: '<%= search_user_project_user_path(User.current.id) %>' + "?send_id=" + id + "&type=<%= @type %>",
+                    data:{send_type:'file'}
+                });
+            }else{
+                $.ajax({
+                    type: 'get',
+                    url: '<%= search_user_course_user_path(User.current.id)%>' + "?send_id=" + id + "&type=<%= @type %>",
+                    data:{send_type:'file'}
+                });
+            }
         }
+
     }
 
     function batch_send(){

From 1402f2076a91b49bd5c71abce7072159cf0ff5d2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 16:53:22 +0800
Subject: [PATCH 14/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_apply_resource_course_message.html.erb | 15 ++++++++++++---
 .../_apply_resource_course_message_reply.html.erb | 13 +++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 4dbec8127..fd493daf2 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -9,9 +9,18 @@
 </li>
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <a title="<%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-    <%= ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
-  </a>
+  <% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
+  <% if ma.course_message.container_type == "Course" %>
+      <%= link_to show_content, course_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <% elsif ma.course_message.container_type == "Project" %>
+      <%= link_to show_content, project_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <% elsif ma.course_message.container_type == "OrgSubfield" %>
+      <%= link_to show_content, org_subfield_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+  <% else %>
+      <a title="<%= show_content %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+        <%= show_content %>
+      </a>
+  <% end %>
 </li>
 
 <li class="<%=(ma.apply_result == 0 || ma.apply_result.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb
index 7cf246c53..617ee53c3 100644
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -14,6 +14,19 @@
             '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
     :
             '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
+    <% if ma.course_message.container_type == "Course" %>
+        <%= link_to link_str, course_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+    <% elsif ma.course_message.container_type == "Project" %>
+        <%= link_to link_str, project_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+    <% elsif ma.course_message.container_type == "OrgSubfield" %>
+        <%= link_to link_str, org_subfield_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+    <% else %>
+        <a title="<%= link_str %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+          <%= link_str %>
+        </a>
+    <% end %>
+
+
     <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
   </a>
   </li>

From e0370e3e32409a0e86c3242994ff973925726fa8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 17:04:46 +0800
Subject: [PATCH 15/25] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b0194a2d8..5148f3318 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2199,6 +2199,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]

From f806dbf587dd20d910b251ed658a7e5d26803b9b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 19 May 2016 17:12:33 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=87=B3=E7=BB=84=E7=BB=87=E5=92=8C=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5148f3318..d86ce379b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2058,6 +2058,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2340,6 +2352,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
+    elsif params[:type] == "2"
+      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      if params[:status] == "2"
+        resource_type = "'Course'"
+      elsif params[:status] == "3"
+        resource_type = "'Project'"
+      elsif params[:status] == "5"
+        resource_type = "'Principal'"
+      else
+        resource_type = "'Project','OrgSubfield','Principal','Course'"
+      end
+      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25

From 92f55e0dc159f4be2ce5adfbd7914ddb9f06335f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 10:02:59 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E7=82=B9=E5=87=BB=E5=BA=95=E9=83=A8=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=8F=91=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d86ce379b..6c5cbd390 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1942,7 +1942,7 @@ class UsersController < ApplicationController
   # 将资源发送到对应的课程,分为发送单个，或者批量发送
   def add_exist_file_to_course
     @flag = true
-    if  params[:send_id].present?
+    if params[:send_id].present?
       send_id  = params[:send_id]
       @ori = Attachment.find_by_id(send_id)
       course_ids = params[:course_ids]
@@ -1989,14 +1989,14 @@ class UsersController < ApplicationController
       end
       send_ids.each do |send_id|
         quotes = 0
-        ori = Attachment.find_by_id(send_id)
+        @ori = Attachment.find_by_id(send_id)
         unless course_ids.nil?
           course_ids.each do |id|
             quotes = 0
-            next if ori.blank?
+            next if @ori.blank?
             @exist = false
             Course.find(id).attachments.each do |att|  #如果课程中包含该资源
-              if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+              if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
                 att.created_on = Time.now
                 att.save
                 @exist = true
@@ -2004,21 +2004,21 @@ class UsersController < ApplicationController
               end
             end
             next if @exist
-            attach_copied_obj = ori.copy
-            attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+            attach_copied_obj = @ori.copy
+            attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
             attach_copied_obj.container = Course.find(id)
             attach_copied_obj.created_on = Time.now
             attach_copied_obj.author_id = User.current.id
             attach_copied_obj.is_public = 0
-            attach_copied_obj.copy_from = ori.copy_from.nil? ? ori.id : ori.copy_from #发送要添加copy_from
+            attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
             if attach_copied_obj.attachtype == nil
               attach_copied_obj.attachtype = 4
             end
             if attach_copied_obj.save
               # 更新引用次数
-              quotes = ori.quotes.to_i + 1
-              ori.update_attribute(:quotes, quotes) unless ori.nil?
-              ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+              quotes = @ori.quotes.to_i + 1
+              @ori.update_attribute(:quotes, quotes) unless @ori.nil?
+              @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
             end
             @save_message = attach_copied_obj.errors.full_messages
           end

From 80f829c0187cb9b0cbe630a7a875ca3a8e5657e0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 10:48:17 +0800
Subject: [PATCH 18/25] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb | 2 +-
 app/views/organizations/teachers.html.erb   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index c94f734e1..62876d757 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -164,7 +164,7 @@ class OrganizationsController < ApplicationController
       return
     end
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
-    @field = OrgSubfield.find(params[:org_subfield_id])
+    @field = params[:org_subfield_id].nil? ? OrgSubfield.where("organization_id =? and field_type =?", params[:id].to_i, "Comptec").first : OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
     if @type == "courses" || @type.nil?
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb
index c368adef7..dac36f7a5 100644
--- a/app/views/organizations/teachers.html.erb
+++ b/app/views/organizations/teachers.html.erb
@@ -9,8 +9,7 @@
 </div>
 <div class="resources mt10">
   <div class="function-row" id="org_teacher_search">
-    <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers', :type => @type),
-                  :remote => true , :method => 'get', :id => 'resource_search_form') do %>
+    <%= form_tag(url_for(:controller => 'organizations', :action => 'teachers', :type => @type), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
         <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
         <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->

From 0d8d2939b33d4376f4e0fd54bd340a4e4b8fe51b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 12:43:47 +0800
Subject: [PATCH 19/25] =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8D=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=9D=A1=E4=BB=B6=E7=9A=84=E4=B8=8D=E8=83=BD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 252798227..3397d5929 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,7 +6,11 @@
     <% attachments.each do |attach| %>
         <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
           <li class="resource-list-checkbox fl">
-            <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+            <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current %>
+                <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+            <% else %>
+                <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+            <% end %>
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">

From f18c3ed6679d88e63314b700914e2f3d5e99e450 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 13:37:18 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E6=B7=BB=E5=8A=A0=E2=80=9D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E2=80=9C=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_new_upload.html.erb    | 3 +++
 app/views/users/_user_resource_info.html.erb | 4 +++-
 app/views/users/user_resource.js.erb         | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_show_new_upload.html.erb

diff --git a/app/views/users/_show_new_upload.html.erb b/app/views/users/_show_new_upload.html.erb
new file mode 100644
index 000000000..b343aeae1
--- /dev/null
+++ b/app/views/users/_show_new_upload.html.erb
@@ -0,0 +1,3 @@
+<% if @type != "2" %>
+    <div class="resourcesUploadBox mt10" ><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+<% end %>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 950dcd6f5..1e3cd508c 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -1,5 +1,7 @@
 <div id="users_setting">
-  <div class="resourcesUploadBox mt10"><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+  <div id="upload_private_resource">
+     <%= render :partial => "show_new_upload", :locals => {:type => @type, :status => @status} %>
+  </div>
   <div id="search_div">
     <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type, :order => @order, :sort => @score, :status => @status} %>
   </div>
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 2fa0035b2..758b8c2f0 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -2,6 +2,7 @@ $("#search_div").html('<%= escape_javascript( render :partial => 'resource_searc
 $("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' , :locals => { :attachments => @attachments}) %>');
 $("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);

From 352b40dd9689eac02220d220ce3104183f17dac4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 13:52:39 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6c5cbd390..20ed22f9e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2836,7 +2836,7 @@ class UsersController < ApplicationController
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
     user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
-    if(params[:type].blank? || params[:type] == "1") # 我的资源
+    if( params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == "2"
         @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
@@ -2850,7 +2850,7 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "6" # 公共资源
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
       if params[:status] == "2"
         @attachments = get_course_resources_public( user_course_ids, @order, @score)
       elsif params[:status] == "3"

From 004c48b456ccc5e74c7244613528cbcf809d0b2e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 14:16:45 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=87=B3=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E9=A1=B9=E7=9B=AE=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/add_exist_file_to_course.js.erb  | 5 ++++-
 app/views/users/add_exist_file_to_project.js.erb | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index 8db83aefc..880bd2877 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,7 +1,10 @@
 <% if @flag == true%>
-$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user => @user, :type => @type} ) %>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 4c24f4932..5690a0f88 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,7 +1,10 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);

From b1e0618742b70e5feb3ade5ebf8ff9b633a67389 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 15:05:04 +0800
Subject: [PATCH 23/25] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 20ed22f9e..1b4fcd499 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2894,8 +2894,7 @@ class UsersController < ApplicationController
   # 导入资源
   def import_resources
     # 别人的资源库是没有权限去看的
-    @user = User.find_by_login(params[:id])
-    if User.current != @user
+    if User.current.id != params[:id].to_i
       render_403
       return
     end

From dddd7e0ea223cfd20689bc36a2346bdb104eb4ab Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 15:28:09 +0800
Subject: [PATCH 24/25] =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 2 ++
 app/views/repositories/show.html.erb       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 4a148bb8b..531f0cb90 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -362,6 +362,8 @@ update
       # project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
       # ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
+      # REDO:需优化，仅测试用
+      @zip_path = gitlab_address.to_s + "/api/v3/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=YTyCv4978MXmdL2B9C62"
       if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
       else
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 276283e97..43be57760 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,7 +1,7 @@
 <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>
 <div class="project_r_h">
   <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
-  <!--<a href="javascript:void(0);" class="btn_zipdown fr" onclick="">ZIP下载</a>-->
+  <a href="<%= @zip_path %>" class="btn_zipdown fr" onclick="">ZIP下载</a>
 
 </div>
 <div class="repository_con" style="line-height:1.9;">

From 5114c12c17cb0ea55ddb8fe4f36e437ce1623d90 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 15:34:35 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E4=B8=BA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index cf94da8d9..7ec796b61 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -256,6 +256,13 @@ class FilesController < ApplicationController
     @order = ""
     @is_remote = false
     if params[:project_id]
+      # 更新资源申请消息为已读
+      # ar_ids = ApplyResource.where("user_id =? and container_id =? and container_type =?", User.current.id, params[:project_id].to_i, "Project").map{|ar| ar.id}
+      # cms = CourseMessage.where("course_message_type =? and user_id =? and course_message_id in (#{ar_ids.empty? ? '0': ar_ids.join(',')})", "ApplyResource", User.current.id)
+      # cms.each do |cm|
+      #   cm.update_column(:viewed, true)
+      # end
+      # over
       @page = params[:page] ? params[:page].to_i + 1 : 2
       @container_type = 0
       if params[:sort]