SimpleDomControl 0.4.18__tar.gz → 0.4.20__tar.gz

{simpledomcontrol-0.4.18 → simpledomcontrol-0.4.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimpleDomControl
-Version: 0.4.18
+Version: 0.4.20
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0

{simpledomcontrol-0.4.18 → simpledomcontrol-0.4.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.4.18"
+version = "0.4.20"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"

{simpledomcontrol-0.4.18 → simpledomcontrol-0.4.20}/sdc_core/consumers.py

@@ -259,6 +259,8 @@ class SDCModelConsumer(WebsocketConsumer):
                 self._init_connection(json_data)
             elif event_type == 'model_edit_form':
                 self._load_edit_form(json_data)
+            elif event_type == 'model_named_form':
+                self._load_named_form(json_data)
             elif event_type == 'model_create_form':
                 self._load_create_form(json_data)
             elif event_type == 'model_list_view':
@@ -348,6 +350,15 @@ class SDCModelConsumer(WebsocketConsumer):
         instance.scope = self.scope
         return self._load_form(json_data, self.model.edit_form, instance)
 
+    def _load_named_form(self, json_data):
+        instance = self._load_model().get(pk=json_data['args']['pk'])
+        instance.scope = self.scope
+        form_name = json_data['args']['form_name']
+        if not hasattr(self.model, 'forms'):
+            raise NotImplemented()
+
+        return self._load_form(json_data, self.model.forms.get(form_name), instance)
+
     def _load_form(self, json_data, form_attr, instance=None):
         if callable(form_attr):
             form_attr = form_attr({})

{simpledomcontrol-0.4.18 → simpledomcontrol-0.4.20}/sdc_core/template_files/package.json

@@ -75,6 +75,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
-    "sdc_client": "^0.4.18"
+    "sdc_client": "^0.4.20"
   }
 }

{simpledomcontrol-0.4.18 → simpledomcontrol-0.4.20}/sdc_tools/Assets/src/sdc_tools/controller/sdc_navigator/sdc_navigator.js

@@ -9,6 +9,25 @@ export class SdcNavigatorController extends AbstractSDC {
     constructor() {
         super();
         this.contentUrl = "/sdc_view/sdc_tools/sdc_navigator"; //<sdc-navigator></sdc-navigator>
+        this._setup();
+        /**
+         * Events is an array of dom events.
+         * The pattern is {'event': {'dom_selector': handler}}
+         * Uncommend the following line to add events;
+         */
+        this.events.unshift({
+            'click': {
+                '.navigation-links': function (btn, ev) {
+                    ev.preventDefault();
+                    // noinspection JSPotentiallyInvalidUsageOfClassThis
+                    this.onNavLink(btn, ev);
+                }
+            }
+        });
+    }
+
+    _setup() {
+
         this._isLoggedIn = false;
         this._history_path = [];
         this._breadcrumb = [];
@@ -25,21 +44,6 @@ export class SdcNavigatorController extends AbstractSDC {
 
         this._non_controller_path_prefix = '/';
         this._menu_id = 0;
-
-        /**
-         * Events is an array of dom events.
-         * The pattern is {'event': {'dom_selector': handler}}
-         * Uncommend the following line to add events;
-         */
-        this.events.unshift({
-            'click': {
-                '.navigation-links': function (btn, ev) {
-                    ev.preventDefault();
-                    // noinspection JSPotentiallyInvalidUsageOfClassThis
-                    this.onNavLink(btn, ev);
-                }
-            }
-        });
     }
 
     //-------------------------------------------------//
@@ -545,15 +549,15 @@ export class SdcNavigatorController extends AbstractSDC {
     }
 
     login() {
-        this._isLoggedIn = true;
-        app.cleanCache();
-        this.onNavigateToController(window.location.pathname);
+        window.addEventListener("beforeunload", function(e){
+            // Do something
+            e.preventDefault();
+        }, false);
+        location.reload();
     }
 
     logout() {
-        this._isLoggedIn = false;
-        app.cleanCache();
-        this.onNavigateToController(window.location.pathname);
+        this.login();
     }
 
 }