From e47415e3ea53b97c0264a82c40b84663de0b1711 Mon Sep 17 00:00:00 2001 From: kamiljarmusik Date: Tue, 22 Feb 2022 09:19:57 +0100 Subject: [PATCH] #2105 User non-admin can add graphical views - fixed name ViewEditController so there are no conflicts when merging; removal of the admin permission requirement for creating a new view; --- .../{ViewEditContorller.java => ViewEditController.java} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename src/org/scada_lts/web/mvc/controller/{ViewEditContorller.java => ViewEditController.java} (99%) diff --git a/src/org/scada_lts/web/mvc/controller/ViewEditContorller.java b/src/org/scada_lts/web/mvc/controller/ViewEditController.java similarity index 99% rename from src/org/scada_lts/web/mvc/controller/ViewEditContorller.java rename to src/org/scada_lts/web/mvc/controller/ViewEditController.java index ba9702a03f..9304eb394c 100644 --- a/src/org/scada_lts/web/mvc/controller/ViewEditContorller.java +++ b/src/org/scada_lts/web/mvc/controller/ViewEditController.java @@ -50,8 +50,8 @@ @Controller -public class ViewEditContorller { - private static final Log LOG = LogFactory.getLog(ViewEditContorller.class); +public class ViewEditController { + private static final Log LOG = LogFactory.getLog(ViewEditController.class); private static final String SUBMIT_UPLOAD = "upload"; private static final String SUBMIT_CLEAR_IMAGE = "clearImage"; @@ -86,7 +86,6 @@ public void setUploadDirectory(String uploadDirectory) { protected ModelAndView showForm(HttpServletRequest request, @RequestParam(value="viewId", required=false) String viewIdStr) throws Exception { View view; User user = Common.getUser(request); - Permissions.ensureAdmin(user); if (viewIdStr != null) { // An existing view.