marty 2.4.7 → 2.4.8

data/app/components/marty/mcfly_grid_panel.rb

@@ -44,23 +44,7 @@ class Marty::McflyGridPanel < Marty::Grid
   end
 
   client_class do |c|
-    c.init_component = l(<<-JS)
-      function() {
-         this.callParent();
-
-         // dup is a non standard button, so we have to explicitly manage
-         // its clickability
-         this.getSelectionModel().on('selectionchange', function(selModel) {
-            this.actions.dupInForm &&
-                this.actions.dupInForm.setDisabled(!selModel.hasSelection() ||
-                                                   !this.permissions.create);
-         }, this);
-      }
-   JS
-  end
-
-  client_class do |c|
-    c.include :dup_in_form
+    c.include :mcfly_grid_panel
   end
 
   action :dup_in_form do |a|

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

@@ -0,0 +1,37 @@
+{
+  initComponent: function () {
+    this.callParent();
+
+    // dup is a non standard button, so we have to explicitly manage
+    // its clickability
+    this.getSelectionModel().on('selectionchange', function (selModel) {
+      this.actions.dupInForm &&
+        this.actions.dupInForm.setDisabled(!selModel.hasSelection() ||
+          !this.permissions.create);
+    }, this);
+  },
+  // copied from basepack grid's onEditInForm
+  netzkeOnDupInForm: function () {
+    var selModel = this.getSelectionModel();
+    var recordId = selModel.getSelection()[0].getId();
+    this.netzkeLoadComponent("edit_window", {
+      title: "Duplicate in Form",
+      serverConfig: {
+        record_id: recordId
+      },
+      callback: function (w) {
+        w.show();
+        var form = w.items.first();
+        form.baseParams = {
+          dup: true
+        };
+        w.on('close', function () {
+          if (w.closeRes === "ok") {
+            this.store.load();
+          }
+        }, this);
+      },
+      scope: this
+    });
+  }
+}

data/app/components/marty/new_posting_form.rb

@@ -5,12 +5,7 @@ class Marty::NewPostingForm < Marty::Form
   has_marty_permissions read: :any
 
   client_class do |c|
-    c.close_me = l(<<-JS)
-    function() {
-      // assume we're embedded in a window
-      this.netzkeGetParentComponent().close();
-    }
-    JS
+    c.include :new_posting_form
   end
 
   action :apply do |a|

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

@@ -0,0 +1,6 @@
+{
+  closeMe: function () {
+    // assume we're embedded in a window
+    this.netzkeGetParentComponent().close();
+  }
+}

data/app/components/marty/panel.rb

@@ -1,11 +1,7 @@
 # Marty's version of the Netzke Panel component.
 class Marty::Panel < Netzke::Core::Panel
   client_class do |c|
-    c.update_body_html = l(<<-JS)
-        function(html){
-          this.body.update(html);
-        }
-      JS
+    c.include :panel
   end
 end
 

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

@@ -0,0 +1,5 @@
+{
+  updateBodyHtml: function (html) {
+    this.body.update(html);
+  }
+}

data/app/components/marty/posting_grid.rb

@@ -13,6 +13,10 @@ class Marty::PostingGrid < Marty::Grid
                            page_size: 12})
   end
 
+  client_class do |c|
+    c.include :posting_grid
+  end
+
   # hijacking delete button
   action :delete do |a|
     a.text      = "Select"
@@ -21,61 +25,6 @@ class Marty::PostingGrid < Marty::Grid
     a.disabled  = true
   end
 
-  client_class do |c|
-    c.init_component = l(<<-JS)
-    function() {
-       this.callParent();
-
-       this.getSelectionModel().on('selectionchange', function(selModel) {
-          this.actions.detail &&
-          this.actions.detail.setDisabled(!selModel.hasSelection());
-       }, this);
-    }
-    JS
-
-    c.detail = l(<<-JS)
-    function() {
-       record_id = this.getSelectionModel().getSelection()[0].getId();
-       this.server.detail({record_id: record_id});
-    }
-    JS
-
-    c.netzke_show_detail = l(<<-JS)
-    function(details) {
-      Ext.create('Ext.Window', {
-        height:         150,
-        minWidth:       250,
-        autoWidth:      true,
-        modal:          true,
-        autoScroll:     true,
-        html:           details,
-        title:          "Posting Details"
-     }).show();
-    }
-    JS
-
-    c.netzke_on_delete = l(<<-JS)
-      function() {
-        var records = [];
-        var me = this;
-        me.getSelectionModel().selected.each(function(r) {
-           records.push(r.getId());
-        }, me);
-
-        // find the root component (main application)
-        var main_app = me;
-        while (1) {
-          var p = main_app.netzkeGetParentComponent();
-          if (!p) { break; }
-          main_app = p;
-        }
-
-        // assumes main_app has serverSelectPosting method
-        main_app.server.selectPosting(records);
-      }
-      JS
-  end
-
   def default_bbar
     [:delete, :detail]
   end

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

@@ -0,0 +1,50 @@
+{
+  initComponent: function () {
+    this.callParent();
+
+    this.getSelectionModel().on('selectionchange', function (selModel) {
+      this.actions.detail &&
+        this.actions.detail.setDisabled(!selModel.hasSelection());
+    }, this);
+  },
+
+  detail: function () {
+    record_id = this.getSelectionModel().getSelection()[0].getId();
+    this.server.detail({
+      record_id: record_id
+    });
+  },
+
+  netzkeShowDetail: function (details) {
+    Ext.create('Ext.Window', {
+      height: 150,
+      minWidth: 250,
+      autoWidth: true,
+      modal: true,
+      autoScroll: true,
+      html: details,
+      title: "Posting Details"
+    }).show();
+  },
+
+  netzkeOnDelete: function () {
+    var records = [];
+    var me = this;
+    me.getSelectionModel().selected.each(function (r) {
+      records.push(r.getId());
+    }, me);
+
+    // find the root component (main application)
+    var main_app = me;
+    while (1) {
+      var p = main_app.netzkeGetParentComponent();
+      if (!p) {
+        break;
+      }
+      main_app = p;
+    }
+
+    // assumes main_app has serverSelectPosting method
+    main_app.server.selectPosting(records);
+  }
+}

data/app/components/marty/promise_view.rb

@@ -5,38 +5,8 @@ class Marty::PromiseView < Netzke::Tree::Base
     config.require :promise_view
   end
 
-  client_class do |config|
-    config.default_get_row_class = l(<<-JS)
-    function(record, index, rowParams, ds) {
-       var status = record.get('status');
-       if (status === false) return "red-row";
-       if (status === true)  return "green-row";
-       return "orange-row";
-    }
-    JS
-
-    config.listen_fn = l(<<-JS)
-    function(obj, search_text) {
-        var lg = this.ownerCt.ownerCt;
-        lg.getStore().getProxy().extraParams.live_search = search_text;
-        lg.getStore().load();
-    }
-    JS
-
-    # Live search box -- direct copy from Marty::LiveSearchGridPanel
-    config.tbar = ['->', {
-                name:  'live_search_text',
-                xtype: 'textfield',
-                enable_key_events: true,
-                ref: '../live_search_field',
-                empty_text: 'Search',
-                listeners: {
-                  change: {
-                    fn: config.listen_fn,
-                    buffer: 500,
-                  }
-                }
-              }]
+  client_class do |c|
+    c.include :promise_view
   end
 
   def configure(config)
@@ -69,49 +39,6 @@ class Marty::PromiseView < Netzke::Tree::Base
     [:clear, '->', :refresh, :download]
   end
 
-  client_class do |config|
-    config.init_component = l(<<-JS)
-    function() {
-       this.callParent();
-       this.getSelectionModel().on('selectionchange', function(selModel) {
-          this.actions.download &&
-          this.actions.download.setDisabled(!selModel.hasSelection());
-       }, this);
-       this.getView().getRowClass = this.defaultGetRowClass;
-    }
-    JS
-
-    config.netzke_on_download = l(<<-JS)
-    function() {
-       var jid = this.getSelectionModel().getSelection()[0].getId();
-       // FIXME: seems pretty hacky
-       window.location = "#{Marty::Util.marty_path}/job/download?job_id=" + jid;
-    }
-    JS
-
-    config.netzke_on_refresh = l(<<-JS)
-    function() {
-       this.store.load();
-    }
-    JS
-
-    config.netzke_on_clear = l(<<-JS)
-    function(params) {
-       var me = this;
-       Ext.Msg.show({
-         title: 'Clear All Jobs',
-         msg: 'Enter CLEAR and press OK to clear all previous jobs',
-         width: 375,
-         buttons: Ext.Msg.OKCANCEL,
-         prompt: true,
-         fn: function (btn, value) {
-          (btn == "ok" && value == "CLEAR") && me.server.clear({});
-         }
-       });
-    }
-    JS
-  end
-
   action :clear do |a|
     a.text     = a.tooltip = 'Clear'
     a.disabled = false

data/app/components/marty/promise_view/client/promise_view.css

@@ -1,26 +1,29 @@
 .green-row {
-    background-color: #91FF91;
+	background-color: #91FF91;
 }
 
 .red-row {
-    background-color: #FF4545;
+	background-color: #FF4545;
 }
 
 .orange-row {
-    background-color: #FF9D5C;
+	background-color: #FF9D5C;
 }
 
 .x-grid-item-selected .green-row {
-    background-color: #549454; /* V: 58 */
-    font-weight: bold;
+	background-color: #549454;
+	/* V: 58 */
+	font-weight: bold;
 }
 
 .x-grid-item-selected .red-row {
-    background-color: #bd3333; /* V: 74 */
-    font-weight: bold;
+	background-color: #bd3333;
+	/* V: 74 */
+	font-weight: bold;
 }
 
 .x-grid-item-selected .orange-row {
-    background-color: #b87243; /* V: 74 */
-    font-weight: bold;
+	background-color: #b87243;
+	/* V: 74 */
+	font-weight: bold;
 }

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

@@ -0,0 +1,57 @@
+{
+  initComponent: function () {
+    var me = this;
+    me.tbar = ['->',
+      {
+        name: 'live_search_text',
+        xtype: 'textfield',
+        enable_key_events: true,
+        ref: '../live_search_field',
+        empty_text: 'Search',
+        listeners: {
+          change: {
+            fn: me.listenFn,
+            buffer: 500,
+          }
+        }
+      }
+    ]
+    this.callParent();
+    this.getSelectionModel().on('selectionchange', function (selModel) {
+      this.actions.download && this.actions.download.setDisabled(!selModel.hasSelection());
+    }, this);
+    this.getView().getRowClass = this.defaultGetRowClass;
+  },
+  defaultGetRowClass: function (record, index, rowParams, ds) {
+    var status = record.get('status');
+    if (status === false) return "red-row";
+    if (status === true) return "green-row";
+    return "orange-row";
+  },
+  listenFn: function (obj, search_text) {
+    var lg = this.ownerCt.ownerCt;
+    lg.getStore().getProxy().extraParams.live_search = search_text;
+    lg.getStore().load();
+  },
+  netzkeOnDownload: function () {
+    var jid = this.getSelectionModel().getSelection()[0].getId();
+    // FIXME: seems pretty hacky
+    window.location = "#{Marty::Util.marty_path}/job/download?job_id=" + jid;
+  },
+  netzkeOnRefresh: function () {
+    this.store.load();
+  },
+  netzkeOnClear: function (params) {
+    var me = this;
+    Ext.Msg.show({
+      title: 'Clear All Jobs',
+      msg: 'Enter CLEAR and press OK to clear all previous jobs',
+      width: 375,
+      buttons: Ext.Msg.OKCANCEL,
+      prompt: true,
+      fn: function (btn, value) {
+        (btn == "ok" && value == "CLEAR") && me.server.clear({});
+      }
+    });
+  }
+}

data/app/components/marty/report_form.rb

@@ -98,79 +98,13 @@ class Marty::ReportForm < Marty::Form
       |r| r.app.app == Marty::Engine
     }.format({})
 
-    c.netzke_on_foreground = l(<<-JS)
+    c.mount_path = l(<<-JS)
     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", "#{@@mount_path}/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);
+      return "#{@@mount_path}"
     }
     JS
 
-    c.netzke_on_link = l(<<-JS)
-    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));
-     }
-    JS
+    c.include :report_form
   end
 
   endpoint :netzke_load do |params|