Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
cms_sys
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
西魏
cms_sys
Commits
eaa1c4b3
Commit
eaa1c4b3
authored
Feb 27, 2019
by
铭飞
Browse files
Options
Browse Files
Download
Plain Diff
!138 去掉多图上传|隔开,请求统一,配置文件
Merge pull request !138 from 田彬杰/4.7.0
parents
f1560171
f8a4aff2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
11 deletions
+1
-11
ArticleAction.java
src/main/java/net/mingsoft/cms/action/ArticleAction.java
+0
-10
index.ftl
src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
+1
-1
upload_file.png
...app/static/plugins/jquery.swfupload/1.0.0/upload_file.png
+0
-0
upload_pic.png
...bapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png
+0
-0
No files found.
src/main/java/net/mingsoft/cms/action/ArticleAction.java
View file @
eaa1c4b3
...
...
@@ -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
);
// 获取栏目实体
...
...
src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
View file @
eaa1c4b3
...
...
@@ -67,7 +67,7 @@
$(function(){
var URL="${managerPath}/template/queryTemplateFileForColumn.do";
var DATA = "";
$(this).request({url:URL,data:DATA,type:"json",method:"
pos
t",func:function(msg) {
$(this).request({url:URL,data:DATA,type:"json",method:"
ge
t",func:function(msg) {
if(msg.length==0){
$("#select_id").append("<option value='' >暂无文件</option>")
}
...
...
src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_file.png
0 → 100644
View file @
eaa1c4b3
1.85 KB
src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png
0 → 100644
View file @
eaa1c4b3
1.14 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment