Merge pull request #680 from SCADA-LTS/feature/#676_test

#672 Correcting from test

.travis.yml

@@ -58,17 +58,17 @@ env:
   - secure: "ZXkg2Dm3k8riijlVIZl5za7H07cO0G2Z3ELQxUtpSSasdQy7oIl0uwgNhiy2mKvTCSXl639j8IH9s9cer8TMkBjXr4ML/5OcDzvJWltqvOMNOIPlX3+28echTAm/emIrVuziTn/nhtZ1YcnHdmshmmNYb+7TD1NX2ds8PGII9OuQsU96w46/YPeTsdTs2VYJz/6D8GPTGUWSu3YjABsYobLqUFfV5QgJKe48MVaRxh7S8bRrwODQk5WpSIFnnhBWR5cHGKlrHx3pdnyBuW4ATQTH4BKgx+GMDYFvM2VCwr/bk+yuYE9j/LZJvxcv1E13OvFyvKdkUGcF34W85YOrG4pKzJP2r6S9ouZT1y6a4THBtzwimk9aae7Vauc1BNh4bYnRI/2HLIxAeYcwncc9KolcuYv2WdSyRxNnT24eXidj+nq1qfb82zWWVyj3fuIw76DfguJX2GeTGGGhXwV3HnyJNlxyN8dd7xmosM4cqmlLfk3hVB8NbuD6/5aN++anKZb4NkIGCi/zGjyRfpnbe7rw6bsrk7TqlAf6/gm4/CC1FG09POkmnYWL0DKjAOV2Z/W/1cdiUC9oeBuK1SJWqU/6p/51UJJrtUT13RQWF4kl85DZ1IJzQXAF0p1ROdTlyhKL3wYSOWJWzaaK/DP63G20zDL/FdCNLTLq/uYbazE="
   - secure: "Cjz0OxIlJzAs66SHv9wFCWW4XdOoUv8YnED8mQG1Ds+I7KwoK7UTglsyzMmaOYYtzlDkAmuwn55wV6aS9lEPh5baT97phlDlUqrv6A/g7KBSS2qRfxt4G6zhoIOg8FCto5D6FU3FVKATbjZ9niT+96LOx61mFi5cLL1DpyylRk7EX4TiZGj4324ymZwItC8aRbdTD24+4zpTNI1irMF8c3TAmF+4/rUcYb0RYGKnbxylWjL83rqszICCce/Bg8ObYIv5a7xTUJX8kF/50iEHyOWJzLxo0IURiwuHdU6CyvFcorZJnQF/wTbZsxpDPhJBwgWE9umz1NekIX3/1+6EJ+nzc1W56lX4Atp5wntj9Bft8gngSmbR51dVxL0kbIiYcvfZvTrjQ00qoZbLlk8FWsfEIdVOqq2Dh0psPVOuzMcUQqAf/4jArxVXKnuzu0V8Z0dVq2zgpzW8DwGIGTBwJ8ySBnJRYsL9vkF/exT43mc9omBVJ5Ec1+WzFDjwMW8+VSwERDxF3Zubj8SXL8gSY2J2YmKEBTPY63qrTc5cWDtVjksYGKmTPKzvhfBn8Ykv8qA1SZSpnKS/4/YF7POxhFeJwyNfn5PWqcpe80JtG701gaRqzKFeB6RMr3NIgi6EAuIBxhsKL0ECISXFf3UsdcxU0rZ4yBESsW9x6jcEarI="
 after_script:
-- wget http://www-us.apache.org/dist/tomcat/tomcat-8/v8.5.32/bin/apache-tomcat-8.5.32.tar.gz
+wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.85/bin/apache-tomcat-7.0.85.tar.gz
 - mkdir ./docker/app
-- mv apache-tomcat-8.5.32.tar.gz ./docker/app
-- ls -l ./docker/app/apache-tomcat-8.5.32.tar.gz
+- mv apache-tomcat-7.0.85.tar.gz ./docker/app
+- ls -l ./docker/app/apache-tomcat-7.0.85.tar.gz
 - cd ./docker/app
 - echo `pwd`
 - echo `ls -l`
-- tar -zxvf apache-tomcat-8.5.32.tar.gz
+- tar -zxvf apache-tomcat-7.0.85.tar.gz
 - ls -l
-- mv ./apache-tomcat-8.5.32/* ./
-- rm -rf ./apache-tomcat-8.5.32
+- mv ./apache-tomcat-7.0.85/* ./
+- rm -rf ./apache-tomcat-7.0.85
 - cp ../../ScadaBR.war ./webapps
 #- cp ../../ScadaLTS-UI/war/ScadaLTS.war ./webapps
 #- ls -l ./webapps/ScadaLTS.war

WebContent/WEB-INF/tags/page.tag

@@ -169,7 +169,7 @@
           <tag:menuItem href="reports.shtm" png="report" key="header.reports"/>
 
           <c:if test="${sessionUser.dataSourcePermission}">
-            <img src="images/menu_separator.png" class="separator"/>
+            <img src="./images/menu_separator.png" class="separator"/>
             <tag:menuItem href="event_handlers.shtm" png="cog" key="header.eventHandlers"/>
             <tag:menuItem href="data_sources.shtm" png="icon_ds" key="header.dataSources"/>
             <tag:menuItem href="scheduled_events.shtm" png="clock" key="header.scheduledEvents"/>
@@ -178,7 +178,7 @@
             <tag:menuItem href="scripting.shtm" png="script_gear" key="header.scripts"/>
           </c:if>
 
-          <img src="images/menu_separator.png" class="separator"/>
+          <img src="./images/menu_separator.png" class="separator"/>
           <tag:menuItem href="users.shtm" png="user" key="header.users"/>
 
           <c:if test="${sessionUser.admin}">
@@ -192,7 +192,7 @@
             <tag:menuItem href="sql.shtm" png="script" key="header.sql"/>
           </c:if>
 
-          <img src="images/menu_separator.png" class="separator"/>
+          <img src="./images/menu_separator.png" class="separator"/>
           <tag:menuItem href="logout.htm" png="control_stop_blue" key="header.logout"/>
           <tag:menuItem href="help.shtm" png="help" key="header.help"/>
         </c:if>

build.xml

@@ -65,9 +65,9 @@
         <pathelement location="WebContent/WEB-INF/lib/iec101.jar"/>
         <pathelement location="WebContent/WEB-INF/lib/j-interop-2.06.jar"/>
         <pathelement location="WebContent/WEB-INF/lib/j-interopdeps-1.4.jar"/>
-        <pathelement location="WebContent/WEB-INF/lib/jackson-annotations-2.7.4.jar"/>
-        <pathelement location="WebContent/WEB-INF/lib/jackson-core-2.7.4.jar"/>
-        <pathelement location="WebContent/WEB-INF/lib/jackson-databind-2.7.4.jar"/>
+        <pathelement location="WebContent/WEB-INF/lib/jackson-annotations-2.8.2.jar"/>
+        <pathelement location="WebContent/WEB-INF/lib/jackson-core-2.8.2.jar"/>
+        <pathelement location="WebContent/WEB-INF/lib/jackson-databind-2.8.2.jar"/>
         <pathelement location="WebContent/WEB-INF/lib/javamelody-1.59.0.jar"/>
         <pathelement location="WebContent/WEB-INF/lib/jaxrpc.jar"/>
         <pathelement location="WebContent/WEB-INF/lib/jboss-common-jdbc-wrapper-3.2.3.jar"/>

src/org/scada_lts/web/mvc/controller/PointHierarchyController.java

@@ -119,7 +119,20 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 		if (user.isAdmin()) {
 			boolean ok = false;
 			if (isFolder) {
-			  ok = phService.delete(parentId, key, isFolder);  
+				try {
+
+					List<PointHierarchyNode> elements = PointHierarchyCache.getInstance().getOnBaseParentId(key);
+					for (PointHierarchyNode element : elements) {
+						if (!element.isFolder()) {
+							phService.move(parentId, 0, element.getKey(), false);
+						}
+					}
+				} catch (Exception e) {
+					LOG.error(e.getMessage());
+					ok = false;
+				}
+
+			  	ok = phService.delete(parentId, key, isFolder);
 			} else {
 				// is point
 			  ok = phService.move(parentId, 0, key, isFolder);