Merge pull request #3 from Webcampak/develop

Preparation for version v3.0.1

Author: Fgerthoffert

Sencha/App6.0/workspace/Desktop/app/controller/desktop/authentication/UserSettings.js

@@ -63,6 +63,13 @@ Ext.define("WPAKD.controller.desktop.authentication.UserSettings", {
         record = this.getDesktopAuthenticationUserSettingsStore().findRecord("CODE", "CURRENTBUILD", 0, false, false, true);
         if (record) {
             this.getDesktoptoolbarbottombuild().setText(i18n.gettext("Build: ") + record.get("VALUE"));
+            var currentCoreVersion = this.getDesktopAuthenticationUserSettingsStore().findRecord("CODE", "VERSION_CORE", 0, false, false, true);
+            var currentUiVersion = this.getDesktopAuthenticationUserSettingsStore().findRecord("CODE", "VERSION_UI", 0, false, false, true);
+            var currentApiVersion = this.getDesktopAuthenticationUserSettingsStore().findRecord("CODE", "VERSION_API", 0, false, false, true);
+            var currentCliVersion = this.getDesktopAuthenticationUserSettingsStore().findRecord("CODE", "VERSION_CLI", 0, false, false, true);
+            if (currentCoreVersion && currentUiVersion && currentApiVersion && currentCliVersion) {
+                this.getDesktoptoolbarbottombuild().setTooltip("CORE: " + currentCoreVersion.get("VALUE") + "<br />UI: " + currentUiVersion.get("VALUE") + "<br />API: " + currentApiVersion.get("VALUE") + "<br />CLI: " + currentCliVersion.get("VALUE"));
+            }
         }
 
         record = this.getDesktopAuthenticationUserSettingsStore().findRecord("CODE", "CURRENTUSERNAME", 0, false, false, true);

Sencha/App6.0/workspace/Desktop/app/model/desktop/authentication/UserSettings.js

@@ -8,7 +8,7 @@ Ext.define("WPAKD.model.desktop.authentication.UserSettings", {
     idProperty : "ID",
 
     fields: [
-        { name: "ID",     type: "int"              }
+        { name: "ID",     type: "int"            }
         , { name: "CODE",     type: "string"     }
         , { name: "VALUE",     type: "string"    }
     ]

Sencha/App6.0/workspace/Desktop/app/view/accesscontrol/Main.js

@@ -12,9 +12,6 @@ Ext.define("WPAKD.view.accesscontrol.Main", {
     width: 1000,
     height: 600,
 
-    stateful: true,
-    stateId: "accesscontrolmain",
-
     scroll: true,
     autoScroll: true,
     maximizable: true,

Sencha/App6.0/workspace/Desktop/app/view/accesscontrol/customers/CustomersList.js

@@ -8,9 +8,6 @@ Ext.define("WPAKD.view.accesscontrol.customers.CustomersList", {
 
     , store: "accesscontrol.customers.Customers"
 
-    , stateful: true
-    , stateId: "accesscontrolcustomerscustomerslist"
-
     , autoScroll: true
     , columns: [
         {text: i18n.gettext("CUS_ID"),              dataIndex: "CUS_ID",            align: "right",     width: 40,  sortable: true,     hidden: true                }

Sencha/App6.0/workspace/Desktop/bootstrap.json

@@ -0,0 +1,45 @@
+/*global Ext*/
+//<debug>
+console.log(new Date().toLocaleTimeString() + ": Log: Load: WPAKD.overrides.RowEditor");
+//</debug>
+Ext.define("override", {
+    override: "Ext.grid.RowEditor",
+    afterRender: function() {
+        var me = this,
+            plugin = me.editingPlugin,
+            grid = plugin.grid;
+        //the FIX
+        me.scroller = grid.view.getScrollable();
+        me.callSuper(arguments);
+        // The scrollingViewEl is the TableView which scrolls
+        me.scrollingView = grid.lockable ? grid.normalGrid.view : grid.view;
+        me.scrollingViewEl = me.scrollingView.el;
+        me.scroller.on("scroll", me.onViewScroll, me);
+        // Prevent from bubbling click events to the grid view
+        me.mon(me.el, {
+            click: Ext.emptyFn,
+            stopPropagation: true
+        });
+        // Ensure that the editor width always matches the total header width
+        me.mon(grid, "resize", me.onGridResize, me);
+        if (me.lockable) {
+            grid.lockedGrid.view.on("resize", "onGridResize", me);
+        }
+        me.el.swallowEvent([
+            "keypress",
+            "keydown"
+        ]);
+        me.initKeyNav();
+        me.mon(plugin.view, {
+            beforerefresh: me.onBeforeViewRefresh,
+            refresh: me.onViewRefresh,
+            itemremove: me.onViewItemRemove,
+            scope: me
+        });
+        me.syncAllFieldWidths();
+        if (me.floatingButtons) {
+            me.body.dom.setAttribute("aria-owns", me.floatingButtons.id);
+        }
+    }
+
+})