Authored by mlge

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

... ... @@ -40,6 +40,8 @@
<div id="tt" class="easyui-layout" style="overflow-y: scroll;overflow-x: auto;">
<form name="publishArticleForm" id="publishArticleForm" method="post" >
<input id="sort" name="sort" value="2" hidden>
<input id="draftArticleId" name="articleId" hidden="hidden"/>
<input id="draftType" name="draftType" hidden="hidden"/>
<div style="margin-top: 20px;margin-left: 30px">
<table border="0" style="width:95%;margin-top:5px;line-height:30px;" id="tab">
... ... @@ -453,7 +455,7 @@
width:200,
onClick: function () {
$("#publishArticleForm").form("submit",{
url : serverContextPath+"/grassArticle/publishArticle",
url : serverContextPath+"/grassArticle/updateArticleDraft",
onSubmit : function(param) {
debugger;
if (!$("#publishArticleForm").form("validate")) {
... ... @@ -464,6 +466,7 @@
$("#sort").val(3);
}
$("#draftType").val(2);
var imgs = '';
var imageCount = 0;
$("input[name='url']").each(function(j,item){
... ... @@ -521,7 +524,7 @@
width:200,
onClick: function () {
$("#publishArticleForm").form("submit",{
url : serverContextPath+"/grassArticle/saveArticleDraft",
url : serverContextPath+"/grassArticle/updateArticleDraft",
onSubmit : function(param) {
debugger;
if (!$("#publishArticleForm").form("validate")) {
... ... @@ -531,6 +534,7 @@
if($("#appurl").is(":checked")){
$("#sort").val(3);
}
$("#draftType").val(1);
var imgs = '';
var imageCount = 0;
$("input[name='url']").each(function(j,item){
... ... @@ -608,7 +612,7 @@
return;
}
$("#publishArticleForm").form("submit",{
url : serverContextPath+"/grassArticle/timerPublish",
url : serverContextPath+"/grassArticle/updateArticleDraft",
onSubmit : function(param) {
debugger;
if (!$("#publishArticleForm").form("validate")) {
... ... @@ -617,7 +621,7 @@
if($("#appurl").is(":checked")){
$("#sort").val(3);
}
$("#draftType").val(3);
param.publishTime =time;
var imgs = '';
var imageCount = 0;
... ...