!138 去掉多图上传|隔开,请求统一,配置文件

Merge pull request !138 from 田彬杰/4.7.0
master
铭飞 7 years ago
commit eaa1c4b3cc
  1. 10
      src/main/java/net/mingsoft/cms/action/ArticleAction.java
  2. 2
      src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
  3. BIN
      src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_file.png
  4. BIN
      src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png

@ -267,11 +267,6 @@ public class ArticleAction extends BaseAction {
}else{
article.setArticleType(checkboxType);
}
// 问题:由于上传的图片路径后面可能带有|符合。所以要进行将“|”替换空
// 空值判断
if (!StringUtils.isBlank(article.getBasicThumbnails())) {
article.setBasicThumbnails(article.getBasicThumbnails().replace("|", ""));
}
ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId());
article.setColumn(column);
@ -397,11 +392,6 @@ public class ArticleAction extends BaseAction {
}else{
article.setArticleType(checkboxType);
}
// 问题:由于上传的图片路径后面可能带有|符合。所以要进行将“|”替换空
// 空值判断
if (!StringUtils.isBlank(article.getBasicThumbnails())) {
article.setBasicThumbnails(article.getBasicThumbnails().replace("|", ""));
}
// 获取更改前的文章实体
ArticleEntity oldArticle = (ArticleEntity) articleBiz.getEntity(basicId);
// 获取栏目实体

@ -67,7 +67,7 @@
$(function(){
var URL="${managerPath}/template/queryTemplateFileForColumn.do";
var DATA = "";
$(this).request({url:URL,data:DATA,type:"json",method:"post",func:function(msg) {
$(this).request({url:URL,data:DATA,type:"json",method:"get",func:function(msg) {
if(msg.length==0){
$("#select_id").append("<option value='' >暂无文件</option>")
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Loading…
Cancel
Save