[REFORMAT] using a path to a serverside file for forwarding now

proteinevolution · Oct 11, 2017 · 409d85b · 409d85b
1 parent df8bf25
commit 409d85b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/app/assets/ui/app/jobmodel.ts b/app/assets/ui/app/jobmodel.ts
@@ -127,5 +127,10 @@ window.JobModel = {
         } else {
             return "";
         }
+    },
+    setParamValue: function(param : string, value : any) : void {
+        console.log("[JobModel.setParamValue]", param, value);
+        window.JobModel.paramValues[param] = value;
+        m.redraw(true);
     }
 };
diff --git a/app/assets/ui/app/jobview/main.ts b/app/assets/ui/app/jobview/main.ts
@@ -11,7 +11,7 @@
                 id: "jobview"
             }, [
                 m(JobLineComponent, { job: args.job }),
-                m(JobTabsComponent, { job: args.job, owner: args.owner })
+                m(JobTabsComponent, { job: args.job })
             ]);
         }
     }

diff --git a/app/assets/ui/app/jobview/submission.ts b/app/assets/ui/app/jobview/submission.ts
@@ -191,7 +191,7 @@
     view: function(ctrl : any, args : any) {
         return m("div", { "class":  "submitbuttons", config: JobSubmissionComponent.hide(ctrl, args) }, [
             m("div", {
-                "class":                 "reveal",
+                "class":               "reveal",
                 "data-reveal":         "data-reveal",
                 "data-animation-in":   "fade-in",
                 "data-overlay":        "true",
@@ -228,7 +228,7 @@
                 style: "float: right;",
                 onclick: ctrl.submit.bind(ctrl, true)
             }),
-            JobSubmissionComponent.jobIDComponent(ctrl), m(ProjectComponent, {})
+            JobSubmissionComponent.jobIDComponent(ctrl)
         ])
     }
 };
diff --git a/app/views/jobs/resultpanels/hhpred/forward.scala.html b/app/views/jobs/resultpanels/hhpred/forward.scala.html
@@ -13,7 +13,6 @@
 <script>
     function tomodeller() {
         localStorage.setItem('resultcookie', $("#pir").text());
-        localStorage.setItem('parentid', '@jobID');
         m.route("/tools/modeller");
     }
 </script>
diff --git a/app/views/jobs/resultpanels/psiblast/hitlist.scala.html b/app/views/jobs/resultpanels/psiblast/hitlist.scala.html
@@ -248,15 +248,7 @@ <h5 id="refTitle">References</h5>
                 $.LoadingOverlay("hide")
             }
         }).done(function (data_) {
-            $.ajax({
-                type: 'GET',
-                url: 'files/'+jobID+'/'+filename+'.fa',
-                error: function(){
-                    $.LoadingOverlay("hide")
-                }
-            }).done(function (data_) {
-                forward(selectedTool, data_.toString());
-            })
+            forwardPath(selectedTool, 'files/'+jobID+'/'+filename+'.fa');
         })
     }
 }

diff --git a/public/javascripts/blast-visualization.js b/public/javascripts/blast-visualization.js
@@ -125,8 +125,7 @@ function forward(tool, forwardData){
 
 
 function forwardPath(tool, forwardPath){
-    window.location.href = "/#/tools/" + tool;
-
+    m.route("/tools/" + tool);
     $.ajax({
         type: 'GET',
         url: forwardPath,
@@ -135,7 +134,7 @@ function forwardPath(tool, forwardPath){
         }
     }).done(function (data) {
         console.log("data", data);
-        $("#alignment").val(data.toString());
+        window.JobModel.setParamValue("alignment", data);
         $.LoadingOverlay("hide")
     })
 }