Merge branch '3.6.1-dev'

src/main/java/org/b3log/solo/processor/console/PageConsole.java

@@ -18,7 +18,6 @@
 package org.b3log.solo.processor.console;
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
 import org.b3log.latke.Keys;
 import org.b3log.latke.Latkes;
 import org.b3log.latke.ioc.Inject;
@@ -43,7 +42,7 @@ import org.json.JSONObject;
  * Plugin console request processing.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.11, Apr 19, 2019
+ * @version 1.0.0.12, Apr 22, 2019
  * @since 0.4.0
  */
 @RequestProcessor
@@ -344,11 +343,6 @@ public class PageConsole {
 
             for (int i = 0; i < pages.length(); i++) {
                 final JSONObject page = pages.getJSONObject(i);
-                final String permalink = page.optString(Page.PAGE_PERMALINK);
-                if (StringUtils.startsWith(permalink, "/")) {
-                    page.put(Page.PAGE_PERMALINK, Latkes.getServePath() + permalink);
-                }
-
                 String title = page.optString(Page.PAGE_TITLE);
                 title = StringEscapeUtils.escapeXml(title);
                 page.put(Page.PAGE_TITLE, title);

src/main/java/org/b3log/solo/service/DataModelService.java

@@ -59,7 +59,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT;
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.7.0.9, Apr 8, 2019
+ * @version 1.7.0.10, Apr 22, 2019
  * @since 0.3.1
  */
 @Service
@@ -863,13 +863,6 @@ public class DataModelService {
         try {
             LOGGER.debug("Filling page navigations....");
             final List<JSONObject> pages = pageRepository.getPages();
-            for (final JSONObject page : pages) {
-                final String permalink = page.optString(Page.PAGE_PERMALINK);
-                if (StringUtils.startsWith(permalink, "/")) {
-                    page.put(Page.PAGE_PERMALINK, Latkes.getServePath() + permalink);
-                }
-            }
-
             dataModel.put(Common.PAGE_NAVIGATIONS, pages);
         } catch (final RepositoryException e) {
             LOGGER.log(Level.ERROR, "Fills page navigations failed", e);

src/main/java/org/b3log/solo/service/PageMgmtService.java

@@ -26,7 +26,6 @@ import org.b3log.latke.repository.Transaction;
 import org.b3log.latke.service.LangPropsService;
 import org.b3log.latke.service.ServiceException;
 import org.b3log.latke.service.annotation.Service;
-import org.b3log.latke.util.Strings;
 import org.b3log.solo.model.Page;
 import org.b3log.solo.repository.CommentRepository;
 import org.b3log.solo.repository.PageRepository;
@@ -127,27 +126,7 @@ public class PageMgmtService {
             final JSONObject oldPage = pageRepository.get(pageId);
             final JSONObject newPage = new JSONObject(page, JSONObject.getNames(page));
             newPage.put(Page.PAGE_ORDER, oldPage.getInt(Page.PAGE_ORDER));
-            String permalink = page.optString(Page.PAGE_PERMALINK).trim();
-
-            final String oldPermalink = oldPage.getString(Page.PAGE_PERMALINK);
-            if (!oldPermalink.equals(permalink)) {
-                if (!Strings.isURL(permalink)) {
-                    if (transaction.isActive()) {
-                        transaction.rollback();
-                    }
-
-                    throw new ServiceException(langPropsService.get("invalidPermalinkFormatLabel"));
-                }
-
-                if (!oldPermalink.equals(permalink) && permalinkQueryService.exist(permalink)) {
-                    if (transaction.isActive()) {
-                        transaction.rollback();
-                    }
-
-                    throw new ServiceException(langPropsService.get("duplicatedPermalinkLabel"));
-                }
-            }
-
+            final String permalink = page.optString(Page.PAGE_PERMALINK).trim();
             newPage.put(Page.PAGE_PERMALINK, permalink);
             page.put(Page.PAGE_ICON, page.optString(Page.PAGE_ICON));
 
@@ -211,15 +190,7 @@ public class PageMgmtService {
             final int maxOrder = pageRepository.getMaxOrder();
             page.put(Page.PAGE_ORDER, maxOrder + 1);
 
-            String permalink = page.optString(Page.PAGE_PERMALINK);
-            if (!Strings.isURL(permalink)) {
-                if (transaction.isActive()) {
-                    transaction.rollback();
-                }
-
-                throw new ServiceException(langPropsService.get("invalidPermalinkFormatLabel"));
-            }
-
+            final String permalink = page.optString(Page.PAGE_PERMALINK);
             if (permalinkQueryService.exist(permalink)) {
                 if (transaction.isActive()) {
                     transaction.rollback();

src/main/webapp/js/admin/admin.js

@@ -19,7 +19,8 @@
  * @description index for admin
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.3.0.0, Mar 30, 2019
+ * @author <a href="http://88250.b3log.org">Liang Ding</a>
+ * @version 1.4.0.0, Apr 22, 2019
  */
 
 Util.htmlDecode = function (code) {
@@ -28,18 +29,6 @@ Util.htmlDecode = function (code) {
   return div.innerText
 }
 
-/**
- * @description URL 没有协议头，则自动加上 http://
- * @param {String} url URL 地址
- * @returns {String} 添加后的URL
- */
-Util.proessURL = function (url) {
-  if (!/^\w+:\/\//.test(url)) {
-    url = 'http://' + url
-  }
-  return url
-}
-
 var Admin = function () {
   this.register = {}
   // 工具栏下的工具

src/main/webapp/js/admin/pageList.js

@@ -20,7 +20,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.3.0.0, Feb 6, 2019
+ * @version 1.3.0.1, Apr 22, 2019
  */
 
 /* page-list 相关操作 */
@@ -202,7 +202,7 @@ admin.pageList = {
             $("#loadMsg").text(Label.loadingLabel);
             $("#tipMsg").text("");
 
-            var pagePermalink = Util.proessURL($("#pagePermalink").val().replace(/(^\s*)|(\s*$)/g, ""));
+            var pagePermalink = $("#pagePermalink").val().replace(/(^\s*)|(\s*$)/g, "");
 
             var requestJSONObject = {
                 "page": {
@@ -255,8 +255,7 @@ admin.pageList = {
             $("#loadMsg").text(Label.loadingLabel);
             $("#tipMsg").text("");
 
-            var pagePermalink = Util.proessURL($("#pagePermalink").val().replace(/(^\s*)|(\s*$)/g, ""));
-
+            var pagePermalink = $("#pagePermalink").val().replace(/(^\s*)|(\s*$)/g, "");
 
             var requestJSONObject = {
                 "page": {