Merge branch 'test6.9.16' of http://git.yoho.cn/platform/platform-cms into test6.9.16

@@ -1039,7 +1039,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
             }
         }
         String noteContent = (StringUtils.isBlank(text)||text.length()<15)?text: (StringUtil.substring(text,0,15)+"...");
-        noteContent = StringUtils.isEmpty(noteContent)?"":noteContent;
+        noteContent = StringUtils.isEmpty(noteContent) ?  " ": noteContent;
         long publishTime = Long.valueOf(grassArticleReq.getPublishTime());
         String timeStr = DateUtil.long2DateStr(publishTime , "yyyyMMddHHmm");
         timeStr = timeStr.substring(0,4)+"年"+timeStr.substring(4,6)+"月"+timeStr.substring(6,8)+"日"+

@@ -141,6 +141,15 @@
             }
         });
 
+        UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
+        UE.Editor.prototype.getActionUrl = function(action) {
+            if (action == 'uploadimage' || action == 'uploadfile') {
+                return serverContextPath + "/fileupload/uploadFile4Editor.do?bucket=grassImg";
+            } else {
+                return this._bkGetActionUrl.call(this, action);
+            }
+        };
+
         // 检索按钮
         $("#searchBtn1").linkbutton({
             iconCls : "icon-search",
@@ -645,7 +654,6 @@
     function longArticleEditer(data){
         var articleEditer = $("<div id='articleEditer'>").appendTo($(document.body));
         var title =  "编辑";
-
         window.self.paramObject.mkData = data;
         $(articleEditer).myDialog({
             title: title,