phanterpwa 14.0.7__tar.gz → 14.1.0__tar.gz

{phanterpwa-14.0.7/phanterpwa.egg-info → phanterpwa-14.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phanterpwa
-Version: 14.0.7
+Version: 14.1.0
 Summary: Tools for the phanterpwadeveloper framework
 Home-page: https://github.com/PhanterJR/phanterpwa
 Author: PhanterJR

{phanterpwa-14.0.7 → phanterpwa-14.1.0}/phanterpwa/__init__.py

@@ -3,7 +3,7 @@
 # license: MIT
 
 __author__ = "PhanterJR<junior.conex@gmail.com>"
-__version__ = "14.0.7"
+__version__ = "14.1.0"
 __install_requeriments__ = [
     "psutil",
     "tornado",

{phanterpwa-14.0.7 → phanterpwa-14.1.0}/phanterpwa/backend/dataforms.py

@@ -1361,17 +1361,21 @@ class FieldsDALValidateDictArgs(object):
         else:
             return None
 
-
     def validate_and_insert(self, dbtable, commit=True):
         self.validate()
         if not self.errors and isinstance(dbtable, Table):
             rep = dbtable.validate_and_insert(**self.verified)
-            dbtable._db._adapter.reconnect()
-            if rep.errors:
-                dbtable._db.rollback()
-            elif rep.id and commit:
-                dbtable._db.commit()
-            return rep
+            if isinstance(rep, dict):
+                if rep.get("errors"):
+                    dbtable._db.rollback()
+                elif rep.get("id") and commit:
+                    dbtable._db.commit()
+            else:
+                if rep.errors:
+                    dbtable._db.rollback()
+                elif rep.id and commit:
+                    dbtable._db.commit()
+                return rep
         else:
             if not self.errors:
                 raise "The dbtable must be pydal.DAL.Table instance. given: {0}.".format(type(dbtable))
@@ -1380,12 +1384,17 @@ class FieldsDALValidateDictArgs(object):
         self.validate()
         if not self.errors and isinstance(dbset, Set):
             rep = dbset.validate_and_update(**self.verified)
-            dbset._db._adapter.reconnect()
-            if rep.errors:
-                dbset._db.rollback
-            elif rep.id and commit:
-                dbset._db.commit()
-            return rep
+            if isinstance(rep, dict):
+                if rep.get("errors"):
+                    dbset._db.rollback()
+                elif rep.get("id") and commit:
+                    dbset._db.commit()
+            else:
+                if rep.errors:
+                    dbset._db.rollback()
+                elif rep.id and commit:
+                    dbset._db.commit()
+                return rep
         else:
             if not self.errors:
                 raise "The dbtable must be pydal.Objects.Set instance. given: {0}.".format(type(dbset))

{phanterpwa-14.0.7 → phanterpwa-14.1.0}/phanterpwa/frontend/components/widgets.py

@@ -528,13 +528,18 @@ class Select(Widget):
                         self._alias_value = vdata
                     self._data_dict[vdata] = vdata
                     new_data.append([vdata, vdata])
-                elif len(vdata) is not 2:
-                    valid_data = False
-                else:
+                elif isinstance(vdata, int):
+                    if self._value == vdata:
+                        self._alias_value = vdata
+                    self._data_dict[vdata] = vdata
+                    new_data.append([vdata, vdata])
+                elif isinstance(vdata, list) and len(vdata) == 2:
                     if self._value == vdata[0]:
                         self._alias_value = vdata[1]
                     self._data_dict[vdata[0]] = vdata[1]
                     new_data.append([vdata[0], vdata[1]])
+                else:
+                    valid_data = False
             if not valid_data:
                 raise ValueError("The data parameter of widget \"{0}\" is invalid!".format(
                     self.identifier

{phanterpwa-14.0.7 → phanterpwa-14.1.0}/phanterpwa/frontend/forms.py

@@ -253,6 +253,7 @@ class CaptchaContainer(helpers.XmlConstructor):
 class FormButton(helpers.XmlConstructor):
     def __init__(self, name, label, **attributes):
         self.label = label
+        self.name = name
         initial_class = "phanterpwa-widget-form-form_button-container"
         if ["_id"] not in attributes:
             attributes["_id"] = "phanterpwa-widget-form-form_button-{0}".format(name)
@@ -260,9 +261,9 @@ class FormButton(helpers.XmlConstructor):
         if "_class" in self.button_attributes:
             self.button_attributes["_class"] = " ".join([
                 self.button_attributes['_class'].strip(),
-                "btn phanterpwa-widget-form-form_button link"])
+                "phanterpwa-widget-form-form_button"])
         else:
-            self.button_attributes["_class"] = "btn phanterpwa-widget-form-form_button link"
+            self.button_attributes["_class"] = "phanterpwa-widget-form-form_button"
         if "_title" not in self.button_attributes:
             if isinstance(self.label, str):
                 self.button_attributes["_title"] = self.label
@@ -271,10 +272,12 @@ class FormButton(helpers.XmlConstructor):
 
     def _update_content(self):
         attributes = self.button_attributes
+        uni = window.PhanterPWA.get_id()
         self.content = [
-            DIV(
-                DIV(self.label, **attributes),
-                _class="button-form")
+            widgets.Button("button_{}".format(uni), self.label, **attributes)
+            # DIV(
+            #     DIV(self.label, **attributes),
+            #     _class="button-form containeeeer")
         ]
 
 
@@ -892,10 +895,9 @@ class ValidateForm():
                 validate_test_pass.append(False)
         if validate_name.startswith("IS_IN_SET:"):
             res = False
-            list_options =  [x[1] for x in widget_instance._data]
-
+            list_options = [str(x[1]) for x in widget_instance._data]
             if list_options is not None or list_options is not js_undefined:
-                if list_options.indexOf(value_for_validate) > -1:
+                if list_options.indexOf(str(value_for_validate)) > -1:
                     res = True
             validate_test_pass.append(res)
 

{phanterpwa-14.0.7 → phanterpwa-14.1.0}/phanterpwa/frontend/validations.py

@@ -180,7 +180,8 @@ class Valider():
             list_options = JSON.parse(validate_name[10:])
             if list_options is not None or list_options is not js_undefined:
                 list_options = JSON.parse(list_options)
-                if list_options.indexOf(value_for_validate) > -1:
+                new_list_options = [str(x[1]) for x in list_options]
+                if new_list_options.indexOf(value_for_validate) > -1:
                     res = True
             validate_test_pass.append(res)
 

{phanterpwa-14.0.7 → phanterpwa-14.1.0}/phanterpwa/i18n/__init__.py

@@ -47,8 +47,11 @@ class Translator(object):
                         self.keys = set(json.load(f))
                 else:
                     basename = os.path.basename(g)[0:-5]
-                    with open(g, 'r', encoding='utf-8') as f:
-                        self._languages[basename] = json.load(f)
+                    try:
+                        with open(g, 'r', encoding='utf-8') as f:
+                            self._languages[basename] = json.load(f)
+                    except json.decoder.JSONDecodeError as e:
+                        raise Exception(e, "file: {g}")
             for l in self._languages:
                 for w in self._languages[l]:
                     if w not in self.keys:

{phanterpwa-14.0.7 → phanterpwa-14.1.0}/phanterpwa/usual_sass/components/buttons.sass

@@ -102,12 +102,12 @@ button
     margin-right: auto 
     .btn 
         width: 100% 
-        width: 100% 
 
     .btn-form, .button-form
         display: inline-block 
-        width: 100% 
         width: 100%
+    button
+        margin: 0
 
 .icon_button
     &.disabled

{phanterpwa-14.0.7 → phanterpwa-14.1.0/phanterpwa.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phanterpwa
-Version: 14.0.7
+Version: 14.1.0
 Summary: Tools for the phanterpwadeveloper framework
 Home-page: https://github.com/PhanterJR/phanterpwa
 Author: PhanterJR