完善后台发布软文提示

jpress-web-admin/src/main/java/io/jpress/admin/controller/_ContentController.java

@@ -634,4 +634,15 @@ public class _ContentController extends JBaseCRUDController<Content> {
 		renderAjaxResultForSuccess(htmlBuilder.toString());
 	}
 
+	public void getContentUrl() {
+		BigInteger contentId = getParaToBigInteger("content_id");
+		String ContentUrl = ContentQuery.me().findById(contentId).getUrl();
+
+		if (StringUtils.isNotBlank(ContentUrl)) {
+			 renderAjaxResultForSuccess(ContentUrl);
+		} else {
+			renderAjaxResultForError(null);
+		}
+	}
+
 }

jpress-web-admin/src/main/webapp/WEB-INF/admin/content/_edit_include.html

@@ -299,7 +299,7 @@
                 <div class="col-md-12">
 					<div class="editUas">
 						<div class="pull-right"><span><a href="${CPATH}/admin/content/edit?m=uuhelper&p=uuhelper&c=edit">取消</a></span></div>
-						<div><span onclick="saveAsDraft()">保存</span><span onclick="save()">发送</span><span onclick="doPreview()">浏览</span></div>
+						<div><span onclick="saveAsDraft('draft')">保存</span><span onclick="save('save')">发送</span><span onclick="doPreview('preview')">浏览</span></div>
 					</div>
 					<div class="row">
 						<div class="col-md-9">

jpress-web-admin/src/main/webapp/WEB-INF/admin/content/edit.html

@@ -108,8 +108,8 @@ function save(turnpage){
 	return false;
  }
 
-function doPreview(){
-	saveAsDraft(turnPage);
+function doPreview(turnpage){
+	saveAsDraft(turnpage);
 
 	/*var slug = $('#content_slug').val();
 	if("" == slug) {
@@ -120,9 +120,24 @@ function doPreview(){
 
 }
 
-function turnPage(){
+function turnPage(turnpage){
 	var contentId = $("#content_id").val();
-	window.location.href = "${CPATH}/admin/content/edit?id="+contentId+"&c=edit&p=uuhelper&m=uuhelper";
+    var contentUrl = null;
+
+	if (turnpage != "preview") {
+		window.location.href = "${CPATH}/admin/content?m=uuhelper&p=uuhelper&c=list";
+	}
+
+
+    $.get("${CPATH}/admin/content/getContentUrl?content_id="+contentId, function(result){
+        console.log(result.message);
+        contentUrl = result.message;
+
+		if (contentUrl) {
+			window.open(contentUrl);
+		}
+    });
+
 }
 
  function saveAsDraft(turnpage){
@@ -140,8 +155,8 @@ function turnPage(){
 					$("#content_id").attr("value",data.data);
 					toastr.success('保存成功！','操作成功');
 					if(turnpage) {
-						turnpage();
-					}
+						turnPage(turnpage);
+                    }
 				}else{
 					toastr.error(data.message,'操作失败');
 				}
@@ -229,9 +244,7 @@ $(document).ready(function(){
     	 $('#content_slug').attr('value',params.newValue);
 	 });
 
-	<#if content?? && "uuhelper" == content.module && ""!=content.url>
-		window.open($("#content_url").val());
-	</#if>
+
 });
 </#macro> 
 <#macro script_import>