marty 2.4.7 → 2.4.8

data/app/components/marty/report_form/client/report_form.js

@@ -0,0 +1,78 @@
+{
+    netzkeOnForeground: function () {
+    var values = this.getForm().getValues();
+    var data = Ext.encode(values);
+
+    var params = {
+      data: data,
+      reptitle: this.reptitle
+    };
+
+    // very hacky -- when selected_testing is set, we assume we're
+    // testing and try to inline the result.
+    if (values["selected_testing"]) {
+      this.repformat = "txt";
+      params["disposition"] = "inline";
+    }
+
+    var form = document.createElement("form");
+
+    form.setAttribute("method", "post");
+    form.setAttribute("action", this.mountPath() + "/report." + this.repformat);
+
+    // set authenticity token
+    var hiddenField = document.createElement("input");
+    hiddenField.setAttribute("type", "hidden");
+    hiddenField.setAttribute("name", "authenticity_token");
+    hiddenField.setAttribute("value", this.authenticityToken);
+    form.appendChild(hiddenField);
+
+    for (var key in params) {
+      if (params.hasOwnProperty(key)) {
+        var hiddenField = document.createElement("input");
+        hiddenField.setAttribute("type", "hidden");
+        hiddenField.setAttribute("name", key);
+        hiddenField.setAttribute("value", params[key]);
+
+        form.appendChild(hiddenField);
+      }
+    }
+
+    document.body.appendChild(form);
+    form.submit();
+    document.body.removeChild(form);
+  },
+
+  netzkeOnLink: function () {
+    var values = this.getForm().getValues();
+
+    // check for early url generation and exit with error message
+    if (values['selected_script_name'] == null) {
+      alert("Please select a report before generating url.");
+      return;
+    }
+
+    params = {
+      "format": this.repformat,
+      "reptitle": this.reptitle
+    }
+
+    for (var key in values) {
+      if (values[key] == "") {
+        delete values[key]
+      }
+    }
+    data = Ext.encode(values)
+
+    // construct url
+    var proto_host = location.protocol + '//' + location.host
+    var url = proto_host + '/report?data=' + data
+    for (var key in params) {
+      if (params[key] == "") continue;
+      url += '&' + key + '=' + params[key];
+    }
+    url = encodeURI(url)
+    var win = window.open('');
+    win.document.write(url.link(url));
+  }
+}

data/app/components/marty/report_select.rb

@@ -47,51 +47,7 @@ class Marty::ReportSelect < Marty::Form
 
   client_class do |c|
     c.header = false
-
-    c.init_component = l(<<-JS)
-    function() {
-       var me = this;
-       me.callParent();
-
-       var tag_grid    = me.netzkeGetComponent('tag_grid').getView();
-       var script_grid = me.netzkeGetComponent('script_grid').getView();
-       var nodename    = me.getForm().findField('nodename');
-
-       nodename.on('select', function(self, record) {
-          if(record instanceof Array) {
-            record = record[0]
-          }
-          var data = record && record.data;
-          me.server.selectNode({node: data.value});
-       });
-
-       tag_grid.getSelectionModel().on('selectionchange',
-        function(self, records) {
-          var tag_id = records[0].get('id');
-          me.server.selectTag({tag_id: tag_id});
-          script_grid.getStore().load();
-       }, me);
-
-       script_grid.getSelectionModel().on('selectionchange',
-        function(self, records) {
-          if(script_grid.getStore().isLoading() == true) return;
-
-          if(records[0] == null)
-             return;
-
-          var script_name = records[0].get('name');
-          me.server.selectScript({script_name: script_name});
-          nodename.reset();
-          nodename.store.load({params: {}});
-          }, me);
-    }
-    JS
-
-    c.parent_select_report = l(<<-JS)
-    function() {
-       this.netzkeGetParentComponent().selectReport();
-    }
-    JS
+    c.include :report_select
   end
 
   # FIXME: should be in a library

data/app/components/marty/report_select/client/report_select.js

@@ -0,0 +1,50 @@
+{
+  initComponent: function () {
+    var me = this;
+    me.callParent();
+
+    var tag_grid = me.netzkeGetComponent('tag_grid').getView();
+    var script_grid = me.netzkeGetComponent('script_grid').getView();
+    var nodename = me.getForm().findField('nodename');
+
+    nodename.on('select', function (self, record) {
+      if (record instanceof Array) {
+        record = record[0]
+      }
+      var data = record && record.data;
+      me.server.selectNode({
+        node: data.value
+      });
+    });
+
+    tag_grid.getSelectionModel().on('selectionchange',
+      function (self, records) {
+        var tag_id = records[0].get('id');
+        me.server.selectTag({
+          tag_id: tag_id
+        });
+        script_grid.getStore().load();
+      }, me);
+
+    script_grid.getSelectionModel().on('selectionchange',
+      function (self, records) {
+        if (script_grid.getStore().isLoading() == true) return;
+
+        if (records[0] == null)
+          return;
+
+        var script_name = records[0].get('name');
+        me.server.selectScript({
+          script_name: script_name
+        });
+        nodename.reset();
+        nodename.store.load({
+          params: {}
+        });
+      }, me);
+  },
+
+  parentSelectReport: function () {
+    this.netzkeGetParentComponent().selectReport();
+  }
+}

data/app/components/marty/reporting.rb

@@ -12,14 +12,7 @@ class Marty::Reporting < Netzke::Base
     c.layout   = :border
     c.defaults = {body_style: 'padding:0px'}
 
-    c.select_report = l(<<-JS)
-    function() {
-       // this.netzkeGetComponent('report_form').netzkeLoad({});
-       // FIXME: NetzkeReload() doesn't work when performed on
-       // ReportForm. So, reload all of Reporting.
-       this.netzkeReload();
-    }
-    JS
+    c.include :reporting
   end
 
   component :report_form do |c|

data/app/components/marty/reporting/client/reporting.js

@@ -0,0 +1,8 @@
+{
+  selectReport: function () {
+    // this.netzkeGetComponent('report_form').netzkeLoad({});
+    // FIXME: NetzkeReload() doesn't work when performed on
+    // ReportForm. So, reload all of Reporting.
+    this.netzkeReload();
+  }
+}

data/app/components/marty/script_form.rb

@@ -1,69 +1,8 @@
 class Marty::ScriptForm < Marty::Form
   DASH = 0x2012.chr('utf-8')
 
-  client_styles do |c|
-    c.require :codemirror
-    c.require :delorean
-  end
-
   client_class do |c|
-    c.require :"Ext.ux.form.field.CodeMirror"
-    c.require :codemirror
-    c.require File.dirname(__FILE__) +
-      "/script_form/client/mode/delorean/delorean.js"
-
-    c.set_action_modes = l(<<-JS)
-    function(a) {
-       this.actions.apply.setDisabled(!a["save"]);
-       // style input field text based on whether it is editable
-       this.getForm().findField('body').editor.setOption(
-          "readOnly", !a["save"]);
-    }
-    JS
-
-    c.get_script_id = l(<<-JS)
-    function() {
-       return this.getForm().findField('id').getValue();
-    }
-    JS
-
-    # Sets an editor line class (unset any previous line class).  For
-    # now, only one line is classed at a time.
-    c.set_line_error = l(<<-JS)
-    function(line) {
-       line -= 1;
-       var editor = this.getForm().findField('body').editor;
-       if (editor.oldline) {
-          editor.oldline.className = null;
-       }
-       if (line > -1) {
-          editor.oldline = editor.setLineClass(line, "errorline");
-       }
-       editor.refresh();
-    }
-    JS
-
-    ######################################################################
-
-    c.refresh_parent = l(<<-JS)
-    function(script_name) {
-       this.netzkeGetParentComponent().scriptRefresh(script_name);
-    }
-    JS
-
-    ######################################################################
-
-    c.netzke_on_do_print = l(<<-JS)
-    function(params) {
-      this.server.doPrint(this.getScriptId());
-    }
-    JS
-
-    c.get_report = l(<<-JS)
-    function(report_path) {
-      window.location = report_path;
-    }
-    JS
+    c.include :script_form
   end
 
   ######################################################################
@@ -215,13 +154,13 @@ class Marty::ScriptForm < Marty::Form
     c.items =
       [
        {
-         mode:           "text/x-delorean",
          line_numbers:   true,
          indent_unit:    4,
          tab_mode:       "shift",
          match_brackets: true,
          hide_label:     true,
          xtype:          :codemirror,
+         mode:           "text/x-delorean",
          name:           :body,
          empty_text:     "No script selected.",
          getter:         lambda { |r| r.body },

data/app/components/marty/script_form/client/script_form.js

@@ -0,0 +1,44 @@
+{
+  setActionModes: function (a) {
+    this.actions.apply.setDisabled(!a["save"]);
+    // style input field text based on whether it is editable
+    this.getForm().findField('body').editor.setOption(
+      "readOnly", !a["save"]);
+  },
+
+  getScriptId: function () {
+    return this.getForm().findField('id').getValue();
+  },
+
+  setLineError: function (idx) {
+
+    idx -= 1;
+    var editor = this.getForm().findField('body').editor;
+
+    if (idx > -1) {
+      var line = editor.getLine(idx)
+      editor.markText({
+        line: idx,
+        ch: 0
+      }, {
+        line: idx,
+        ch: line.length
+      }, {
+        className: "errorline"
+      });
+    }
+    editor.refresh();
+  },
+
+  refreshParent: function (script_name) {
+    this.netzkeGetParentComponent().scriptRefresh(script_name);
+  },
+
+  netzkeOnDoPrint: function (params) {
+    this.server.doPrint(this.getScriptId());
+  },
+
+  getReport: function (report_path) {
+    window.location = report_path;
+  }
+}

data/app/components/marty/script_tester.rb

@@ -31,13 +31,7 @@ class Marty::ScriptTester < Marty::Form
   end
 
   client_class do |c|
-    c.set_result = l(<<-JS)
-    function(html) {
-       var result = this.netzkeGetComponent('result');
-       result.updateBodyHtml(html);
-    }
-    JS
-
+    c.include :script_tester
   end
 
   def new_engine

data/app/components/marty/script_tester/client/script_tester.js

@@ -0,0 +1,7 @@
+{
+  setResult: function (val) {
+    var result = this.netzkeGetComponent('result');
+    result.updateBodyHtml(val);
+  }
+
+}

data/app/components/marty/scripting.rb

@@ -30,63 +30,9 @@ class Marty::Scripting < Netzke::Base
   end
 
   client_class do |c|
-
     c.header = false
     c.layout = :border
-
-    c.init_component = l(<<-JS)
-    function() {
-       var me = this;
-       me.callParent();
-
-       var tag_grid      = me.netzkeGetComponent('tag_grid').getView();
-       var script_grid   = me.netzkeGetComponent('script_grid').getView();
-       var script_form   = me.netzkeGetComponent('script_form');
-
-       tag_grid.getSelectionModel().on('selectionchange',
-          function(self, records) {
-
-          if(records[0] == null)
-             return;
-
-          var tag_id = records[0].get('id');
-          me.server.selectTag({tag_id: tag_id});
-          script_grid.getStore().load();
-          var script_name = null;
-          script_form.server.netzkeLoad({script_name: script_name});
-          }, me);
-
-       script_grid.getSelectionModel().on('selectionchange',
-          function(self, records) {
-
-          if(script_grid.getStore().isLoading() == true)
-             return;
-
-          if(records[0] == null)
-             return;
-
-          var script_name = records[0].get('name');
-          me.server.selectScript({script_name: script_name});
-          script_form.server.netzkeLoad({script_name: script_name});
-          }, me);
-    }
-    JS
-
-    c.script_refresh = l(<<-JS)
-    function(script_name) {
-       if (!script_name) {
-          this.server.selectScript({});
-          this.netzkeReload();
-       }
-       else {
-          this.server.selectScript({script_name: script_name});
-          this.netzkeGetComponent('tag_grid').getStore().load();
-          this.netzkeGetComponent('script_grid').getStore().load();
-          this.netzkeGetComponent('script_form').server.netzkeLoad(
-             {script_name: script_name});
-       }
-    }
-    JS
+    c.include :scripting
   end
 
   endpoint :select_tag do |params|

data/app/components/marty/scripting/client/scripting.js

@@ -0,0 +1,62 @@
+{
+  initComponent: function () {
+    var me = this;
+    me.callParent();
+
+    var tag_grid = me.netzkeGetComponent('tag_grid').getView();
+    var script_grid = me.netzkeGetComponent('script_grid').getView();
+    var script_form = me.netzkeGetComponent('script_form');
+
+    tag_grid.getSelectionModel().on('selectionchange',
+      function (self, records) {
+
+        if (records[0] == null)
+          return;
+
+        var tag_id = records[0].get('id');
+        me.server.selectTag({
+          tag_id: tag_id
+        });
+        script_grid.getStore().load();
+        var script_name = null;
+        script_form.server.netzkeLoad({
+          script_name: script_name
+        });
+      }, me);
+
+    script_grid.getSelectionModel().on('selectionchange',
+      function (self, records) {
+
+        if (script_grid.getStore().isLoading() == true)
+          return;
+
+        if (records[0] == null)
+          return;
+
+        var script_name = records[0].get('name');
+        me.server.selectScript({
+          script_name: script_name
+        });
+        script_form.server.netzkeLoad({
+          script_name: script_name
+        });
+      }, me);
+  },
+
+  scriptRefresh: function (script_name) {
+    if (!script_name) {
+      this.server.selectScript({});
+      this.netzkeReload();
+    } else {
+      this.server.selectScript({
+        script_name: script_name
+      });
+      this.netzkeGetComponent('tag_grid').getStore().load();
+      this.netzkeGetComponent('script_grid').getStore().load();
+      this.netzkeGetComponent('script_form').server.netzkeLoad({
+        script_name: script_name
+      });
+    }
+  },
+
+}