Merge pull request #2829 from SCADA-LTS/fix/#1075_Reset_the_view_name…

…_after_loading_the_background_file #1075 Reset the view name after loading the background file
SCADA-LTS · Feb 28, 2024 · 556c4ef · 556c4ef
2 parents adc2bd8 + d742afa
commit 556c4ef
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/com/serotonin/mango/util/ViewControllerUtils.java b/src/com/serotonin/mango/util/ViewControllerUtils.java
@@ -3,6 +3,7 @@
 import com.serotonin.mango.Common;
 import com.serotonin.mango.view.View;
 import org.scada_lts.mango.service.ViewService;
+import org.scada_lts.serorepl.utils.StringUtils;
 import org.scada_lts.utils.HttpParameterUtils;
 
 import javax.servlet.http.HttpServletRequest;
@@ -18,6 +19,10 @@ public static View getOrEmptyView(HttpServletRequest request, ViewService viewSe
         if(view == null) {
             view = HttpParameterUtils.getObject("emptyView", request, View.class).orElseGet(View::new);
         }
+        String viewName = HttpParameterUtils.getValue("view.name", request, a -> a).orElse("");
+        if(!StringUtils.isEmpty(viewName)) {
+            view.setName(viewName);
+        }
         return view;
     }