marty 2.4.7 → 2.4.8

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

@@ -1,89 +1,91 @@
 {
-    netzkeOnSignIn: function() {
-        var me = this;
-        this.signinWin = this.signinWin || Ext.create('Ext.Window', {
-            modal:      true,
-            layout:     'fit',
+  netzkeOnSignIn: function () {
+    var me = this;
+    this.signinWin = this.signinWin || Ext.create('Ext.Window', {
+      modal: true,
+      layout: 'fit',
 
-            submit: function() {
-                var form        = this.items.first();
-                var values      = form.getForm().getValues();
+      submit: function () {
+        var form = this.items.first();
+        var values = form.getForm().getValues();
 
-                // calling the endpoint
-                me.server.signIn(values, function(res) {
-                    if (res) {
-                        if (!me.authSpecMode) { this.signinWin.close(); }
-                        Ext.Msg.show({
-                            title:      "Signed in",
-                            msg:        "Signed in successfully, reloading...",
-                            icon:       Ext.Msg.INFO,
-                            closable:   false
-                        });
-                        if (!me.authSpecMode) { window.location.href = "/"; }
-                    }
-                });
-            },
-
-            closeAction: 'hide',
-            title: "Sign in",
-            fbar: [
-                {
-                    text: 'OK',
-                    name: 'signin_submit',
-                    handler: function() {
-                        this.up('window').submit();
-                    },
-                },
-                {
-                    text:'Cancel',
-                    handler: function() {
-                        this.up('window').close();
-                    },
-                },
-            ],
-
-            items: {
-                xtype:          'form',
-                defaultType:    'textfield',
-                bodyPadding:    '15px 15px 0px 10px',
-                defaults: {
-                    listeners: {
-                        specialkey: function (field, event) {
-                            if (event.getKey() == event.ENTER) {
-                                field.up('window').submit();
-                            }
-                        }
-                    },
-                },
-                items: [
-                    {
-                        fieldLabel:     'Login',
-                        name:           'login',
-                    },
-                    {
-                        fieldLabel:     'Password',
-                        name:           'password',
-                        inputType:      'password',
-                    }
-                ]
+        // calling the endpoint
+        me.server.signIn(values, function (res) {
+          if (res) {
+            if (!me.authSpecMode) {
+              this.signinWin.close();
+            }
+            Ext.Msg.show({
+              title: "Signed in",
+              msg: "Signed in successfully, reloading...",
+              icon: Ext.Msg.INFO,
+              closable: false
+            });
+            if (!me.authSpecMode) {
+              window.location.href = "/";
             }
+          }
         });
+      },
 
-        this.signinWin.show();
-        this.signinWin.down('textfield').focus(false, 100);
-    },
+      closeAction: 'hide',
+      title: "Sign in",
+      fbar: [{
+          text: 'OK',
+          name: 'signin_submit',
+          handler: function () {
+            this.up('window').submit();
+          },
+        },
+        {
+          text: 'Cancel',
+          handler: function () {
+            this.up('window').close();
+          },
+        },
+      ],
 
-    netzkeOnSignOut: function() {
-        this.server.signOut(null, function(success) {
-            if (success) {
-                Ext.Msg.show({
-                    title:      "Signed out",
-                    msg:        "Signed out, reloading the application...",
-                    icon:       Ext.Msg.INFO,
-                    closable:   false
-                });
-                window.location.href = "/";
+      items: {
+        xtype: 'form',
+        defaultType: 'textfield',
+        bodyPadding: '15px 15px 0px 10px',
+        defaults: {
+          listeners: {
+            specialkey: function (field, event) {
+              if (event.getKey() == event.ENTER) {
+                field.up('window').submit();
+              }
             }
-        })
-    }
+          },
+        },
+        items: [{
+            fieldLabel: 'Login',
+            name: 'login',
+          },
+          {
+            fieldLabel: 'Password',
+            name: 'password',
+            inputType: 'password',
+          }
+        ]
+      }
+    });
+
+    this.signinWin.show();
+    this.signinWin.down('textfield').focus(false, 100);
+  },
+
+  netzkeOnSignOut: function () {
+    this.server.signOut(null, function (success) {
+      if (success) {
+        Ext.Msg.show({
+          title: "Signed out",
+          msg: "Signed out, reloading the application...",
+          icon: Ext.Msg.INFO,
+          closable: false
+        });
+        window.location.href = "/";
+      }
+    })
+  }
 }

data/app/components/marty/data_grid_view.rb

@@ -6,61 +6,8 @@ module Marty; class DataGridView < McflyGridPanel
 
   include Extras::Layout
 
-  def self.show_grid_js(options={})
-    dg        = options[:data_grid] || 'data_grid'
-    title_str = options[:title_str] || 'Data Grid'
-
-    javascript = l(<<-JS)
-    function() {
-       var sel = this.getSelectionModel().getSelection()[0];
-       var record_id = sel && sel.getId();
-       this.server.showGrid({record_id: record_id,
-                            data_grid: "#{dg}",
-                            title_str: "#{title_str}"});
-    }
-    JS
-    javascript
-  end
-
-  def self.client_show_grid_js
-    javascript = l(<<-JS)
-    function(count, data, title_str) {
-       var columns = [];
-       var fields  = [];
-
-       for (var i=0; i<count; i++) {
-          fields.push("a" + i);
-          columns.push({dataIndex: "a" + i, text: i, flex: 1});
-       }
-
-       Ext.create('Ext.Window', {
-         height:        "80%",
-         width:         "80%",
-         x:             0,
-         y:             0,
-         autoWidth:     true,
-         modal:         true,
-         autoScroll:    true,
-         title:         title_str,
-         items: {
-           xtype:       'grid',
-           border:      false,
-           hideHeaders: false,
-           columns:     columns,
-           store:       Ext.create('Ext.data.ArrayStore', {
-             fields: fields,
-             data: data,
-             })
-         },
-      }).show();
-    }
-    JS
-    javascript
-  end
-
   client_class do |c|
-    c.netzke_show_grid        = DataGridView.show_grid_js
-    c.netzke_client_show_grid = DataGridView.client_show_grid_js
+    c.include :data_grid_view
   end
 
   def configure(c)

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

@@ -0,0 +1,49 @@
+{
+  netzkeShowGrid: function (options = {}) {
+    var dg = options.dataGrid || 'data_grid'
+    var title_str = options.titleStr || 'Data Grid'
+
+    var sel = this.getSelectionModel().getSelection()[0];
+    var record_id = sel && sel.getId();
+    this.server.showGrid({
+      record_id: record_id,
+      data_grid: dg,
+      title_str: title_str
+    });
+  },
+
+  netzkeClientShowGrid: function (count, data, title_str) {
+    var columns = [];
+    var fields = [];
+
+    for (var i = 0; i < count; i++) {
+      fields.push("a" + i);
+      columns.push({
+        dataIndex: "a" + i,
+        text: i,
+        flex: 1
+      });
+    }
+
+    Ext.create('Ext.Window', {
+      height: "80%",
+      width: "80%",
+      x: 0,
+      y: 0,
+      autoWidth: true,
+      modal: true,
+      autoScroll: true,
+      title: title_str,
+      items: {
+        xtype: 'grid',
+        border: false,
+        hideHeaders: false,
+        columns: columns,
+        store: Ext.create('Ext.data.ArrayStore', {
+          fields: fields,
+          data: data,
+        })
+      },
+    }).show();
+  },
+}

data/app/components/marty/form.rb

@@ -2,10 +2,6 @@ class Marty::Form < Netzke::Form::Base
   extend ::Marty::Permissions
 
   client_class do |c|
-    c.find_component = l(<<-JS)
-    function(name) {
-      return Ext.ComponentQuery.query(`[name=${name}]`)[0];
-    }
-    JS
+    c.include :form
   end
 end

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

@@ -0,0 +1,5 @@
+{
+  findComponent: function (name) {
+    return Ext.ComponentQuery.query(`[name=${name}]`)[0];
+  }
+}

data/app/components/marty/grid.rb

@@ -13,152 +13,7 @@ class Marty::Grid < ::Netzke::Grid::Base
   end
 
   client_class do |c|
-    c.get_component = l(<<-JS)
-    function(name) {
-      return Ext.getCmp(name);
-    }
-    JS
-
-    c.find_component = l(<<-JS)
-    function(name) {
-      return Ext.ComponentQuery.query(`[name=${name}]`)[0];
-    }
-    JS
-
-    c.set_disable_component_actions = l(<<-JS)
-    function(prefix, flag) {
-      for (var key in this.actions) {
-        if (key.substring(0, prefix.length) == prefix) {
-          this.actions[key].setDisabled(flag);
-        }
-      }
-    }
-    JS
-
-    c.init_component = l(<<-JS)
-    function() {
-      this.dockedItems = this.dockedItems || [];
-      if (this.paging == 'pagination') {
-        this.dockedItems.push({
-          xtype: 'pagingtoolbar',
-          dock: 'bottom',
-          layout: {overflowHandler: 'Menu'},
-          listeners: {
-            'beforechange': this.disableDirtyPageWarning ? {} : {
-              fn: this.netzkeBeforePageChange, scope: this
-            }
-          },
-          store: this.store,
-          items: this.bbar && ["-"].concat(this.bbar)
-        });
-      } else if (this.bbar) {
-        this.dockedItems.push({
-          xtype: 'toolbar',
-          dock: 'bottom',
-          layout: {overflowHandler: 'Menu'},
-          items: this.bbar
-        });
-      }
-
-      // block creation of toolbars in parent
-      delete this.bbar;
-      var paging  = this.paging
-      if (paging != 'buffered') { this.paging = false; }
-      this.callParent();
-      this.paging = paging
-
-      var me = this;
-
-      var children = me.serverConfig.child_components || [];
-      me.onSelectionChange(
-      function(m) {
-        var has_sel = m.hasSelection();
-
-        var rid = null;
-        if (has_sel) {
-          if (m.type == 'spreadsheet') {
-            var cell = m.getSelected().startCell;
-            rid = cell && cell.record.getId();
-          }
-          if (!rid) {
-            selected = m.getSelection()[0];
-            rid = selected && selected.getId();
-          }
-        }
-
-        me.serverConfig.selected = rid;
-        me.setDisableComponentActions('do', !has_sel);
-
-        for (var child of children) {
-          var comp = me.findComponent(child)
-          if (comp) {
-            comp.serverConfig.parent_id = rid;
-            if (comp.setDisableComponentActions) {
-              comp.setDisableComponentActions('parent', !has_sel);
-            }
-            if (comp.reload) { comp.reload() }
-          }
-        }
-      });
-
-      var store  = me.getStore();
-      var linked = me.serverConfig.linked_components || [];
-      for (var event of ['update', 'netzkerefresh']) {
-        store.on(event, function() {
-        for (var link of linked) {
-            var comp = me.findComponent(link);
-            if (comp && comp.reload) { comp.reload() }
-          }
-        }, this);
-      }
-    }
-    JS
-
-    c.on_selection_change = l(<<-JS)
-    function(f) {
-      var me = this;
-      me.getSelectionModel().on('selectionchange', f);
-    }
-    JS
-
-    c.do_view_in_form = l(<<-JS)
-    function(record){
-      this.netzkeLoadComponent("view_window", {
-        serverConfig: {record_id: record.id},
-        callback: function(w){
-          w.show();
-          w.on('close', function(){
-            if (w.closeRes === "ok") {
-              this.netzkeReloadStore();
-            }
-          }, this);
-        }});
-    }
-    JS
-
-    c.reload = l(<<-JS)
-    function(opts={}) {
-      this.netzkeReloadStore(opts);
-    }
-    JS
-
-    c.reload_all = l(<<-JS)
-    function() {
-      var me = this;
-      var children = me.serverConfig.child_components || [];
-      this.store.reload();
-      for (child of children) {
-        var comp = me.findComponent(child);
-        if (comp && comp.reload) { comp.reload() }
-      }
-    }
-    JS
-
-    c.clear_filters = l(<<-JS)
-    function() {
-      this.filters.clearFilters();
-    }
-    JS
+    c.include :grid
   end
 
   ######################################################################