From 4b7fa3a040d00ad1c6fa4340205d07f2a165fd34 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 09:19:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=8F=8F=E8=BF=B0=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/views/files/_org_subfield_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 2b0dce4fa..fcf0e9982 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -44,7 +44,7 @@
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                   </div>
                   <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
-                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container.organization,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                 </div>
             <% else %>
                 <div class="fontGrey2 mb4">

From 7c729107cca630eb1f4478fb7fa48ae624fd788c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 20 Jun 2016 09:40:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?KE=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=BF=9D=E7=95=99=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=9A=84=E5=A4=96=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/pasteimg.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 97d5e33c5..d7ffead5b 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -371,7 +371,8 @@ function df(myself) {
                     sstr += that.attr("src") + "|";
             }
             else if (that.attr("src").indexOf("data:image") >= 0){
-                that.parents().removeAttr("href"); //删除所有父节点的href
+                //去掉外链
+//                that.parents().removeAttr("href"); //删除所有父节点的href
             }
         }
     });
@@ -421,10 +422,10 @@ function uploadpic(piclist,myself) {
 
                             //复制过来带的链接class等都要去掉 和视频图片有关系
                             that.removeAttr("class");
-                            that.parent().removeAttr("class");
-                            that.parents().removeAttr("href"); //删除所有父节点的href
-//                            that.parent().removeAttr("href");
-                            that.parent().removeAttr("data-ke-src");
+                            //去掉外链
+//                            that.parent().removeAttr("class");
+//                            that.parents().removeAttr("href"); //删除所有父节点的href
+//                            that.parent().removeAttr("data-ke-src");
                             tIndex = tIndex + 1;
                         }
                     }