Merge pull request #2129 from SCADA-LTS/fix/#2128_Fixed_feature_Apply…

…_new_properties_basing_on_in_point_properties Fix/#2128 fixed feature apply new properties basing on in point properties
SCADA-LTS · Mar 4, 2022 · c6998bf · c6998bf
2 parents b708b15 + 4c64aa8
commit c6998bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/WebContent/WEB-INF/jsp/dataPointEdit.jsp b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
@@ -20,8 +20,8 @@
 
 <tag:page dwr="DataPointEditDwr">
 
-     <link href="resources/app/bower_components/sweetalert2/dist/sweetalert2.min.css" rel="stylesheet" type="text/css">
-     <script type="text/javascript" src="resources/app/bower_components/sweetalert2/dist/sweetalert2.min.js"></script>
+     <link href="resources/node_modules/sweetalert2/dist/sweetalert2.min.css" rel="stylesheet" type="text/css">
+     <script type="text/javascript" src="resources/node_modules/sweetalert2/dist/sweetalert2.min.js"></script>
 
      <style type="text/css">
 

diff --git a/build.gradle b/build.gradle
@@ -122,6 +122,10 @@ task buildRunDebug(type: GradleBuild) {
     tasks = ['clearTomcat', 'test', 'war', 'deployTomcat', 'runDebug']
 }
 
+task buildRunDebugDev(type: GradleBuild) {
+    tasks = ['clearTomcat', 'installWebDependency', 'test', 'war', 'deployTomcat', 'runDebug']
+}
+
 test {
     filter {
         includeTestsMatching "org.scada_lts.cached.DataPointsCacheComposeDataSourcesDataTest"