djgentelella 0.4.7__py3-none-any.whl → 0.4.8__py3-none-any.whl

djgentelella/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.7'
+__version__ = '0.4.8'
 
 if __name__ == '__main__':
     print(__version__)

djgentelella/static/gentelella/js/base/digital_signature.js

@@ -5,10 +5,32 @@ var socket_connections = {};
 var socket_manager_instances = {};
 const max_close_inicialice = 5;
 var count_close_inicialice=0;
+
+// Configuración del MutationObserver
+const observer = new MutationObserver((mutations) => {
+    mutations.forEach((mutation) => {
+        if (mutation.type === 'attributes' && mutation.attributeName === 'data-port') {
+            let port = mutation.target.getAttribute('data-port');
+            mutation.target.setAttribute("href",
+                    "firmador:" + window.location.protocol + "//" + window.location.host + "#" + port);
+        }
+    });
+});
+
+build_cors_headers = function(instance){
+    let port = instance.getAttribute('data-port');
+    instance.setAttribute("href", "firmador:" + window.location.protocol + "//" + window.location.host + "#" + port);
+    observer.observe(instance, { attributes: true });
+}
+
+build_ws_url = function(base){
+    return base;
+}
+
 build_digital_signature = function (instance) {
 
     const widgetId = instance.getAttribute("id");
-    const url_ws = instance.getAttribute("data-ws-url");
+    const url_ws = build_ws_url(instance.getAttribute("data-ws-url"));
     const container = instance.closest(".widget-digital-signature");
     const container_tag = `container-${widgetId}`;
     const doc_instance = {

djgentelella/static/gentelella/js/base.js

@@ -2255,10 +2255,32 @@ var socket_connections = {};
 var socket_manager_instances = {};
 const max_close_inicialice = 5;
 var count_close_inicialice=0;
+
+// Configuración del MutationObserver
+const observer = new MutationObserver((mutations) => {
+    mutations.forEach((mutation) => {
+        if (mutation.type === 'attributes' && mutation.attributeName === 'data-port') {
+            let port = mutation.target.getAttribute('data-port');
+            mutation.target.setAttribute("href",
+                    "firmador:" + window.location.protocol + "//" + window.location.host + "#" + port);
+        }
+    });
+});
+
+build_cors_headers = function(instance){
+    let port = instance.getAttribute('data-port');
+    instance.setAttribute("href", "firmador:" + window.location.protocol + "//" + window.location.host + "#" + port);
+    observer.observe(instance, { attributes: true });
+}
+
+build_ws_url = function(base){
+    return base;
+}
+
 build_digital_signature = function (instance) {
 
     const widgetId = instance.getAttribute("id");
-    const url_ws = instance.getAttribute("data-ws-url");
+    const url_ws = build_ws_url(instance.getAttribute("data-ws-url"));
     const container = instance.closest(".widget-digital-signature");
     const container_tag = `container-${widgetId}`;
     const doc_instance = {

djgentelella/static/gentelella/js/widgets.js

@@ -306,6 +306,11 @@ document.gtwidgets = {
             build_digital_signature(e);
         });
     },
+    FirmadorCORS: function (instance){
+        instance.each(function (i, e) {
+            build_cors_headers(e);
+        });
+    }
 }
 
 function gt_find_initialize(instance) {

djgentelella/templates/gentelella/widgets/digital_signature.html

@@ -125,7 +125,7 @@
 				<li>
 					<a class="small"
 								title="{% trans 'Run Firmador Libre' %}"
-								href="firmador:{{ widget.attrs.cors }}">
+								href="firmador:localhost" data-widget="FirmadorCORS" data-port="3516">
 						{% trans 'Run app' %}
 						<i class="fa fa-cog" aria-hidden="true"></i>
 					</a>

djgentelella/widgets/digital_signature.py

@@ -22,15 +22,13 @@ class DigitalSignatureInput(HiddenInput, ValueDSParser):
     def is_hidden(self):
         return True
 
-    def __init__(self, attrs=None, extraskwargs=True, ws_url=None, cors=None,
+    def __init__(self, attrs=None, extraskwargs=True,
                  title=None, render_basename=None, icon_url=None,
                  extra_render_args=None,
                  default_page="first"):
         attrs = attrs or {}
-        attrs['data-ws-url'] = ws_url
-        attrs['cors'] = cors
         attrs['title'] = title
-
+        attrs['data-ws-url'] = settings.FIRMADOR_WS_URL
         self.render_basename = render_basename
         self.icon_url = icon_url
         self.extra_render_args = extra_render_args or []
@@ -40,31 +38,17 @@ class DigitalSignatureInput(HiddenInput, ValueDSParser):
         if self.render_basename is None:
             logger.warning(
                 "No base name for DigitalSignatureInput, this will generate a 500 error in the future")
-        self.validate_attrs(attrs, ws_url, cors, default_page)
+        self.validate_attrs(attrs, default_page)
 
         if extraskwargs:
             attrs = update_kwargs(
                 attrs, self.__class__.__name__, )
         super().__init__(attrs)
 
-    def validate_attrs(self, attrs, ws_url, cors, default_page):
-        if not ws_url:
-            if not ws_url and settings.FIRMADOR_WS_URL:
-                attrs['data-ws-url'] = settings.FIRMADOR_WS_URL
-            else:
-                raise ValueError(
-                    "Must provide a ws_url in attrs of DigitalSignatureInput.")
-
-        if not cors:
-            if not cors and settings.FIRMADOR_CORS:
-                attrs['cors'] = settings.FIRMADOR_CORS
-            else:
-                raise ValueError(
-                    "Must provide a cors in attrs of DigitalSignatureInput.")
+    def validate_attrs(self, attrs, default_page):
 
         if isinstance(default_page, int) and default_page > 0:
-            attrs['data-default-page'] = str(
-                default_page)
+            attrs['data-default-page'] = str(default_page)
         elif default_page in ["first", "last"]:
             attrs['data-default-page'] = default_page
         else:

{djgentelella-0.4.7.dist-info → djgentelella-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: djgentelella
-Version: 0.4.7
+Version: 0.4.8
 Summary: Help building extra widgets for forms and speciall methods to render forms in templates
 Author-email: Solvosoft <info@solvosoft.com>
 Maintainer-email: Luis Zarate Montero <luis.zarate@solvosoft.com>

{djgentelella-0.4.7.dist-info → djgentelella-0.4.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-djgentelella/__init__.py,sha256=-FDAIq3Uw8k-kTuiU6tpvyrlwEjRZ-tSnDQwCZaUN14,73
+djgentelella/__init__.py,sha256=gRAtlaBwC06sP2YcrcTfseRomODWB-ixPo8nyIxm0d4,73
 djgentelella/admin.py,sha256=hFPWtRyTZWYtuKEv-SZ3r6lHw3aissX0ObqxYmxblY0,1531
 djgentelella/apps.py,sha256=5VEbpUv4b1Jh7gCRAQCe5TvpakRyndKwafjVj0z-Xfo,153
 djgentelella/chartjs.py,sha256=iNYoFnaIQoXsYInJFbSE2quWpjmDz5CuMKpVsvt4pRM,8572
@@ -142,12 +142,12 @@ djgentelella/static/gentelella/images/forward_disabled.png,sha256=7enxADzvJa3VzC
 djgentelella/static/gentelella/images/forward_enabled.png,sha256=vLOxO1qvkBV2ev931iHx-VV63NjrgoTQbwtR4kdVVrA,1380
 djgentelella/static/gentelella/images/forward_enabled_hover.png,sha256=T6LWiaYzcT2fuJAGEaZGxd8Lok3rlZerlVxiy6d647Q,1379
 djgentelella/static/gentelella/images/loading.gif,sha256=dyCz9kckQBZKy7DpKpR3hL4xgQgnShbMue3Ao9h_lK0,30269
-djgentelella/static/gentelella/js/base.js,sha256=kX6xR3vTK0g1FLdQkaaplv5-g_NuPcqmAXu-tZMOGWg,127681
+djgentelella/static/gentelella/js/base.js,sha256=JUaFMKl7ycsb-4NNSTddI3srvN4M_Ppt9b2NlexWvpQ,128476
 djgentelella/static/gentelella/js/custom.js,sha256=O9GWx1FbkMYzbUSzlYw3SrfZrf9xPdMokPh91xMtdUY,14922
 djgentelella/static/gentelella/js/datatables.js,sha256=ZmEBPhoj8jDgl_1g14J9tKtiMknyzBekp1_NqAlxjuU,13743
 djgentelella/static/gentelella/js/obj_api_management.js,sha256=wAVqz9hp5NdJC2dxA_l3mxIeUA2N3fSXuTRADJDCyR4,32127
 djgentelella/static/gentelella/js/permissionmanagement.js,sha256=Y6n0jRtVr6LVadA3frJ6Ec7FXeuEUS6EsZ2ZgSIj7Y0,8211
-djgentelella/static/gentelella/js/widgets.js,sha256=l6nQvotvoMeneNupSXjUqNb6LPKXrMOkQz010e3hRpc,12794
+djgentelella/static/gentelella/js/widgets.js,sha256=aHg5mHWW3ogJOo1v5g5zthFHFQBNkrmBJcw--0UUuXY,12926
 djgentelella/static/gentelella/js/base/api_list.js,sha256=jhhsWJ9VsZiZiHzusxMqDq9IDPbt14b3u9tTHIgLqvU,3942
 djgentelella/static/gentelella/js/base/autocompleteSelect2.js,sha256=lAxbjsssMrkUqNRQEM0tKmLzZO1fi50k-kHCXsromGY,1216
 djgentelella/static/gentelella/js/base/booleanFields.js,sha256=LGBu86uauuX5F1Jq_Z_T6M2R4BRNdRtgiqx20VgYJB0,1573
@@ -155,7 +155,7 @@ djgentelella/static/gentelella/js/base/calendar.js,sha256=gU_AGEWiXX0MSTb9KC6S39
 djgentelella/static/gentelella/js/base/chart.js,sha256=zXJSd-hrWI-vzc-k_CRFv8Kwa2w0anBIu4Fu8gVuHdA,1567
 djgentelella/static/gentelella/js/base/custom.widgets.js,sha256=bMcE6gNNn9AABlZNqDDV_rn7Vm3cDp-wtgQ1kmilsJI,5533
 djgentelella/static/gentelella/js/base/dateranges_gridslider.js,sha256=TGR9Ko9MZVZGhPhe3ubvzMZcEWrlBLH2SA3E239LRyI,5571
-djgentelella/static/gentelella/js/base/digital_signature.js,sha256=C7rX15LXOSGj3srXRY8dVYT2NHGwjqfYmx8Pb63Q5xg,38479
+djgentelella/static/gentelella/js/base/digital_signature.js,sha256=G6mgUQr4ojozSw-KxfHCq5wx9mMC0EPIK4uaaUASGpw,39274
 djgentelella/static/gentelella/js/base/editorTinymce.js,sha256=2fT36ECHyQKLP0X74zYsSHZZ0Rqg-UywDMbG5LjJVac,1118
 djgentelella/static/gentelella/js/base/fileupload.widget.js,sha256=MIniB9KLE8ozKuDqy5EovrZBbscqEYPMsS70ecgNB1w,10653
 djgentelella/static/gentelella/js/base/form.common.js,sha256=Jppy687iqyTQrf_MTgCCksdESjuV-TmrcQKGLhGT1kg,9170
@@ -946,7 +946,7 @@ djgentelella/templates/gentelella/widgets/daterange.html,sha256=zD2zqX6PJ7QQ13Ux
 djgentelella/templates/gentelella/widgets/daterangetime.html,sha256=Ag9z_eHHARgpmoSIJ2MXFyThtQ9bv5bpdTS0yIGu6p4,97
 djgentelella/templates/gentelella/widgets/datetime.html,sha256=bQ5cQwTzI2bDEV6X3Y8kYuD7Q_eDaX0ypFPEE1-36iU,201
 djgentelella/templates/gentelella/widgets/datetime_input_mask.html,sha256=iEBUOXNxJHWojdMOUrh41rrC4RZCVLu3MZXB3zaW4nc,94
-djgentelella/templates/gentelella/widgets/digital_signature.html,sha256=cnJxzKcFlW4Vqx9uK0fFHAwxMnxpANZJggABXlvm3Wg,7083
+djgentelella/templates/gentelella/widgets/digital_signature.html,sha256=LsKTct6sYDAEZXFAENuz4VF3STDY9FFe5JNmXAnVWpo,7113
 djgentelella/templates/gentelella/widgets/email.html,sha256=I9LYprz3wsdv__o32aJSYipzw8joukowweIVD7fBXrs,46
 djgentelella/templates/gentelella/widgets/email_input_mask.html,sha256=iEBUOXNxJHWojdMOUrh41rrC4RZCVLu3MZXB3zaW4nc,94
 djgentelella/templates/gentelella/widgets/file.html,sha256=RyZ49aJJ-RIIoN5Gk7qadW5qjOEhEZEK6hdTsX-P0iI,1549
@@ -1018,7 +1018,7 @@ djgentelella/views/upload.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 djgentelella/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/widgets/calendar.py,sha256=hvQj1EfVuGkZKsLYL2SWHbcihUV0M1hOyxGEf76MGpc,1459
 djgentelella/widgets/core.py,sha256=aUGi0f-iUzXcZDXnvsSv-n7QZTpwiQnJ6NVjwecPNds,22129
-djgentelella/widgets/digital_signature.py,sha256=ZnvZ92E7q_47ezHwpOn10i0HyTud_5PikLzYPiNsPb0,4318
+djgentelella/widgets/digital_signature.py,sha256=aHxD-H8uVUVsIWgisDv83_Qc5hR2GhQwZx1PhWqdC00,3703
 djgentelella/widgets/files.py,sha256=KBmC1QBbTmhZyTOGiziMuEd865qkMd-HFi-rtsGssc4,2347
 djgentelella/widgets/helper.py,sha256=Q9EFc_ulLCu1VVdsub2m4UkunJW17KNiBncR-SDFj7U,826
 djgentelella/widgets/numberknobinput.py,sha256=bTKJ8fHendEhVhAeZw0jq2PGH_Th6D3EJ9M7IrvG2m4,407
@@ -1032,9 +1032,9 @@ djgentelella/widgets/trees.py,sha256=bV6s-w1cgYahS0aNU6xBrx-aISdlzDZ23BFt3_3hAu4
 djgentelella/widgets/wysiwyg.py,sha256=wHeMyYNVE8-lKJ06A-0DLDAcRNv3TOAOG_Wl9DYZqS0,609
 djgentelella/wysiwyg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djgentelella/wysiwyg/views.py,sha256=tI7LjLhCnohdvIEOEEhB2Cu1zxRmdcOhYJJX4LBIZaA,1159
-djgentelella-0.4.7.dist-info/AUTHORS,sha256=HyQoO-q7oXtavpNm7jaBVv8Vxx3c7yo33xkFkt4blkY,118
-djgentelella-0.4.7.dist-info/LICENSE.txt,sha256=wDzqAntLQORAL6vQhVdzZyfsPVvFStZKtkct5DIZjK0,18047
-djgentelella-0.4.7.dist-info/METADATA,sha256=ODtBafWXW4pBk0mx_86-b8GlagOUnwgBtHXZjk9NeyM,27544
-djgentelella-0.4.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-djgentelella-0.4.7.dist-info/top_level.txt,sha256=88JbODVPV-P5q7ic25yMHt_FuuizaLzMyIaegpFa7Qk,13
-djgentelella-0.4.7.dist-info/RECORD,,
+djgentelella-0.4.8.dist-info/AUTHORS,sha256=HyQoO-q7oXtavpNm7jaBVv8Vxx3c7yo33xkFkt4blkY,118
+djgentelella-0.4.8.dist-info/LICENSE.txt,sha256=wDzqAntLQORAL6vQhVdzZyfsPVvFStZKtkct5DIZjK0,18047
+djgentelella-0.4.8.dist-info/METADATA,sha256=CL83r3sDU856JK462UmNRASIb4nzsqLIswEIiW7_j_k,27544
+djgentelella-0.4.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+djgentelella-0.4.8.dist-info/top_level.txt,sha256=88JbODVPV-P5q7ic25yMHt_FuuizaLzMyIaegpFa7Qk,13
+djgentelella-0.4.8.dist-info/RECORD,,