cleanup

maxcom · Nov 4, 2023 · 072252f · 072252f
1 parent 9abcded
commit 072252f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 22 deletions.
diff --git a/src/main/scala/ru/org/linux/comment/AddCommentController.scala b/src/main/scala/ru/org/linux/comment/AddCommentController.scala
@@ -36,7 +36,6 @@ import ru.org.linux.spring.dao.MessageText
 import ru.org.linux.topic.{TopicPermissionService, TopicPrepareService}
 import ru.org.linux.util.{ServletParameterException, StringUtil}
 
-import java.util
 import java.util.Optional
 import javax.servlet.http.HttpServletRequest
 import javax.validation.Valid
@@ -51,13 +50,6 @@ class AddCommentController(ipBlockDao: IPBlockDao, commentPrepareService: Commen
   @ModelAttribute("ipBlockInfo")
   def loadIPBlock(request: HttpServletRequest): IPBlockInfo = ipBlockDao.getBlockInfo(request.getRemoteAddr)
 
-  @ModelAttribute("modes")
-  def getModes: util.Map[String, String] = AuthUtil.AuthorizedOpt { currentUser =>
-    val tmpl = Template.getTemplate
-
-    MessageTextService.postingModeSelector(currentUser, tmpl.getFormatMode).asJava
-  }
-
   /**
     * Показ формы добавления ответа на комментарий.
     */

diff --git a/src/main/scala/ru/org/linux/comment/EditCommentController.scala b/src/main/scala/ru/org/linux/comment/EditCommentController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2022 Linux.org.ru
+ * Copyright 1998-2023 Linux.org.ru
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
  *    You may obtain a copy of the License at
@@ -50,9 +50,6 @@ class EditCommentController(commentService: CommentCreateService, msgbaseDao: Ms
   @ModelAttribute("ipBlockInfo")
   def loadIPBlock(request: HttpServletRequest): IPBlockInfo = ipBlockDao.getBlockInfo(request.getRemoteAddr)
 
-  @ModelAttribute("modes")
-  def getModes: util.Map[String, String] = Map.empty[String, String].asJava
-
   /**
     * Показ формы изменения комментария.
     */

diff --git a/src/main/webapp/WEB-INF/jsp/add.jsp b/src/main/webapp/WEB-INF/jsp/add.jsp
@@ -20,7 +20,6 @@
 <%--@elvariable id="group" type="ru.org.linux.group.Group"--%>
 <%--@elvariable id="section" type="ru.org.linux.section.Section"--%>
 <%--@elvariable id="template" type="ru.org.linux.site.Template"--%>
-<%--@elvariable id="modes" type="java.util.Map"--%>
 <%--@elvariable id="addportal" type="java.lang.String"--%>
 <%--@elvariable id="form" type="ru.org.linux.topic.AddTopicRequest"--%>
 <%--@elvariable id="postscoreInfo" type="java.lang.String"--%>

diff --git a/src/main/webapp/WEB-INF/jsp/add_comment.jsp b/src/main/webapp/WEB-INF/jsp/add_comment.jsp
@@ -5,7 +5,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="l" uri="http://www.linux.org.ru" %>
 <%--
-  ~ Copyright 1998-2022 Linux.org.ru
+  ~ Copyright 1998-2023 Linux.org.ru
   ~    Licensed under the Apache License, Version 2.0 (the "License");
   ~    you may not use this file except in compliance with the License.
   ~    You may obtain a copy of the License at
@@ -91,7 +91,6 @@
         msg="${add.msg}"
         mode="${add.mode}"
         form_action_url="${form_action_url}"
-        postscoreInfo="${postscoreInfo}"
-        modes="${modes}"/>
+        postscoreInfo="${postscoreInfo}"/>
 
 <jsp:include page="/WEB-INF/jsp/footer.jsp"/>
diff --git a/src/main/webapp/WEB-INF/jsp/comment-message.jsp b/src/main/webapp/WEB-INF/jsp/comment-message.jsp
@@ -3,7 +3,7 @@
 <%@ taglib prefix="l" uri="http://www.linux.org.ru" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%--
-  ~ Copyright 1998-2022 Linux.org.ru
+  ~ Copyright 1998-2023 Linux.org.ru
   ~    Licensed under the Apache License, Version 2.0 (the "License");
   ~    you may not use this file except in compliance with the License.
   ~    You may obtain a copy of the License at
@@ -47,6 +47,6 @@
         mode="${add.mode}"
         ipBlockInfo="${ipBlockInfo}"
         form_action_url="${form_action_url}"
-        postscoreInfo="${preparedMessage.postscoreInfo}" modes="${modes}" />
+        postscoreInfo="${preparedMessage.postscoreInfo}"/>
 
 <jsp:include page="/WEB-INF/jsp/footer.jsp"/>
diff --git a/src/main/webapp/WEB-INF/jsp/edit_comment.jsp b/src/main/webapp/WEB-INF/jsp/edit_comment.jsp
@@ -4,7 +4,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="l" uri="http://www.linux.org.ru" %>
 <%--
-  ~ Copyright 1998-2022 Linux.org.ru
+  ~ Copyright 1998-2023 Linux.org.ru
   ~    Licensed under the Apache License, Version 2.0 (the "License");
   ~    you may not use this file except in compliance with the License.
   ~    You may obtain a copy of the License at
@@ -57,6 +57,6 @@
         mode="${add.mode}"
         form_action_url="${form_action_url}"
         cancel="true"
-        postscoreInfo="${postscoreInfo}" modes="${modes}" />
+        postscoreInfo="${postscoreInfo}"/>
 
 <jsp:include page="/WEB-INF/jsp/footer.jsp"/>
diff --git a/src/main/webapp/WEB-INF/jsp/view-topic.jsp b/src/main/webapp/WEB-INF/jsp/view-topic.jsp
@@ -411,7 +411,7 @@
             mode="${template.formatMode}"
             ipBlockInfo="${ipBlockInfo}"
             form_action_url="${form_action_url}"
-            postscoreInfo="${preparedMessage.postscoreInfo}" modes="${modes}" />
+            postscoreInfo="${preparedMessage.postscoreInfo}"/>
   </div>
 </c:if>
 

diff --git a/src/main/webapp/WEB-INF/tags/commentForm.tag b/src/main/webapp/WEB-INF/tags/commentForm.tag
@@ -29,7 +29,6 @@
 <%@ attribute name="cancel" required="false" type="java.lang.Boolean" %>
 <%@ attribute name="ipBlockInfo" required="false" type="ru.org.linux.auth.IPBlockInfo" %>
 <%@ attribute name="postscoreInfo" required="true" type="java.lang.String" %>
-<%@ attribute name="modes" required="true" type="java.util.Map" %>
 
 <form:form modelAttribute="add" method="POST" action="${form_action_url}" id="commentForm">
   <lor:csrf/>