Policy options not saved in settings (#1762)

Stratio · Feb 13, 2017 · 79582e4 · 79582e4
1 parent 26a96ad
commit 79582e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/serving-core/src/main/scala/com/stratio/sparta/serving/core/models/policy/PolicyModel.scala b/serving-core/src/main/scala/com/stratio/sparta/serving/core/models/policy/PolicyModel.scala
@@ -44,8 +44,6 @@ case class PolicyModel(
                         initSqlSentences: Seq[SqlSentence] = Seq.empty[SqlSentence],
                         autoDeleteCheckpoint: Option[Boolean] = None,
                         executionMode: Option[String] = None,
-                        driverLocation: Option[String] = None,
-                        pluginsLocation: Option[String] = None,
                         driverUri: Option[String] = None,
                         stopGracefully: Option[Boolean] = None
                       )

diff --git a/web/src/scripts/factories/policy-model-factory.js b/web/src/scripts/factories/policy-model-factory.js
@@ -36,7 +36,9 @@
       policy.cubes = [];
       policy.streamTriggers = [];
       policy.sparkConf = {};
-      policy.sparkSubmitArguments = {};
+      policy.sparkSubmitArguments = [];
+      policy.initSqlSentences = [];
+      policy.userPluginsJars = [];
       delete policy.id;
       ///* Reset policy advanced settings to be loaded from template automatically */
       delete policy.sparkStreamingWindowNumber;
@@ -51,11 +53,15 @@
       delete policy.initSqlSentences;
       delete policy.userPluginsJars;
       delete policy.executionMode;
+      delete policy.driverUri;
+      delete policy.stopGracefully;
     }
 
     function setPolicy(inputPolicyJSON) {
       policy.id = inputPolicyJSON.id;
       policy.name = inputPolicyJSON.name;
+      policy.driverUri = inputPolicyJSON.driverUri;
+      policy.stopGracefully = inputPolicyJSON.stopGracefully;
       policy.description = inputPolicyJSON.description;
       policy.sparkStreamingWindow = inputPolicyJSON.sparkStreamingWindow;
       policy.remember = inputPolicyJSON.remember;