marty 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e0cd1fb1ea76e53a48783a66d697d7d7014d2ed
-  data.tar.gz: 4f3bc6b7970ed8f8bcb394b28ad4a91f583078bd
+  metadata.gz: a348a98b692037a2ab1dbc2d09d32d64be591374
+  data.tar.gz: bb8f318e11ba6164af0102b71c3edffbc852c78b
 SHA512:
-  metadata.gz: 9d0859d91f1b17547f132cef0123b19255f8186839fcbc11e145d716272de3f2b3f749eec155e5f00ff249b4640f2e61ee76cb01f7c2d6b8f37e57cd7637f8bf
-  data.tar.gz: 9d05effd3f15b9f08ac668c6ba9cd7bfa6d3bb22eac7351c7cd3726cab51e7da6bea0683080023234683d52d6373735818bc50a96a160f26ddc4535719192361
+  metadata.gz: 60e777f722bdd38bea19a725018210bef66700acc5fb5c6b14356e4454deaf4dc9bcd2150bd6fc17c4de098c504f9c8706537943ecede9791b988ad3381f7204
+  data.tar.gz: e66099a715242f06fec907becf577f37d40c058125c6dd4244509b6443f9f8a62255d518e30faa2cd9c0936b506b6ae4fc872496b9994ba3b198b4462063f0cf

data/app/components/marty/report_form.rb

@@ -25,35 +25,36 @@ class Marty::ReportForm < Marty::Form
 
   ######################################################################
 
-  # FIXME: Most of the following functionality should be moved out to
-  # a library.  It doesn't belong here in a component.  These are
-  # currently also getting called form the report controller.
-
-  # FIXME: The usage of session/root_sess should be entirely removed.
-  # Instead we should send in :selected_node, :selected_tag_id,
-  # :selected_script_name as params.
-
-  def self.get_report_engine(params, session)
+  def self.get_report_engine(params)
     d_params = ActiveSupport::JSON.decode(params[:data] || "{}")
     d_params.each_pair do |k,v|
       d_params[k] = nil if v.blank? || v == "null"
     end
 
-    tag_id, script_name =
-      session[:selected_tag_id], session[:selected_script_name]
+    tag_id      = d_params.delete("selected_tag_id")
+    script_name = d_params.delete("selected_script_name")
+    node        = d_params.delete("selected_node")
 
     engine = Marty::ScriptSet.new(tag_id).get_engine(script_name)
 
-    [engine, d_params]
+    roles = engine.evaluate(node, "roles", {}) rescue nil
+
+    if roles && !roles.any?{ |r| Marty::User.has_role(r) }
+      # insufficient permissions
+      return []
+    end
+
+    d_params["p_title"] ||= engine.evaluate(node, "title", {}).to_s
+
+    [engine, d_params, node]
   end
 
-  def self.run_eval(params, session)
-    node = session[:selected_node]
+  def self.run_eval(params)
+    engine, d_params, node = get_report_engine(params)
 
+    raise "no engine" unless engine # insufficient permissions
     raise "no selected report node" unless String === node
 
-    engine, d_params = get_report_engine(params, session)
-
     begin
       engine.evaluate(node, "result", d_params)
     rescue => exc
@@ -66,42 +67,16 @@ class Marty::ReportForm < Marty::Form
     end
   end
 
-  def export_content(format, title, params={})
-    data = self.class.run_eval(params, session)
-
-    # hacky: shouldn't have error parsing logic here
-    format = "json" if data.is_a?(Hash) && (data[:error] || data["error"])
-
-    # hack for testing -- txt -> csv
-    exp_format = format == "txt" ? "csv" : format
-
-    res, type, disposition, filename =
-      Marty::ContentHandler.export(data, exp_format, title)
-
-    # hack for testing -- set content-type
-    type = "text/plain" if format == "txt" && type =~ /csv/
-
-    [res, type, disposition, filename]
-  end
-
   endpoint :netzke_submit do |params, this|
     # We get here when user is asking for a background report
 
-    engine, d_params = self.class.get_report_engine(params, session)
+    engine, d_params, node = self.class.get_report_engine(params)
 
-    roles = engine.
-      evaluate(session[:selected_node], "roles", {}) rescue nil
-
-    if roles && !roles.any?{ |r| Marty::User.has_role(r) }
-      this.netzke_feedback "Insufficient permissions to run report!"
-      return
-    end
-
-    d_params["p_title"] ||= engine.
-      evaluate(session[:selected_node], "title", {}).to_s
+    return this.netzke_feedback "Insufficient permissions to run report!" unless
+      engine
 
     # start background promise to get report result
-    engine.background_eval(session[:selected_node],
+    engine.background_eval(node,
                            d_params,
                            ["result", "title", "format"],
                            )
@@ -220,13 +195,15 @@ class Marty::ReportForm < Marty::Form
     items = [{html: "<br><b>No input is needed for this report.</b>"}] if
       items.empty?
 
-    # Hacky: store these globally in session so we can get them on
-    # report generation request which comes out of band.  Also, if the
-    # user's script/tag selection changes, we don't need to redraw
-    # report_form.
-    session[:selected_tag_id]      = root_sess[:selected_tag_id]
-    session[:selected_script_name] = root_sess[:selected_script_name]
-    session[:selected_node]        = root_sess[:selected_node]
+    # add hidden fields for selected tag/script/node
+    items += [:selected_tag_id, :selected_script_name, :selected_node].map { |f|
+      {
+        name:   f,
+        xtype:  :textfield,
+        hidden: true,
+        value:  root_sess[f],
+      }
+    }
 
     c.items     = items
     c.repformat = format

data/app/components/marty/script_form.rb

@@ -62,6 +62,7 @@ class Marty::ScriptForm < Marty::Form
 
     ######################################################################
 
+    # FIXME: no longer works -- see related FIXME below.
     c.on_print = <<-JS
     function() {
        window.open(
@@ -197,7 +198,10 @@ class Marty::ScriptForm < Marty::Form
 
   ######################################################################
 
-  # used for printing
+  # Used for printing: REALLY FIXME -- this no longer works since the
+  # removal of the component export_content hack. -- To fix, we should
+  # create a ScriptPrint report.  Then, we should have the button run
+  # this report in the foreground.
   def export_content(format, title, params={})
     raise "unknown format: #{format}" unless format == "html"
 

data/app/controllers/marty/report_controller.rb

@@ -5,7 +5,7 @@ class Marty::ReportController < ActionController::Base
 
     raise "bad format" unless Marty::ContentHandler::GEN_FORMATS.member?(format)
 
-    data = Marty::ReportForm.run_eval(params, session)
+    data = Marty::ReportForm.run_eval(params)
 
     # hacky: shouldn't have error parsing logic here
     format = "json" if data.is_a?(Hash) && (data[:error] || data["error"])

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.17"
+  VERSION = "0.5.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - Arman Bostani
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg