djgentelella 0.3.9__tar.gz → 0.3.11__tar.gz

{djgentelella-0.3.9/djgentelella.egg-info → djgentelella-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: djgentelella
-Version: 0.3.9
+Version: 0.3.11
 Summary: Extra widgets for django using gentelella.
 Home-page: https://solvosoft.com
 Author: Luis Zarate Montero

djgentelella-0.3.11/djgentelella/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.3.11'

djgentelella-0.3.11/djgentelella/decorators/perms.py

@@ -0,0 +1,46 @@
+from django.contrib.auth.decorators import user_passes_test
+from django.core.exceptions import PermissionDenied
+
+
+def any_permission_required(perms, login_url=None, raise_exception=False):
+    """
+    Decorator for views that checks whether user has any permission
+    enabled in perms list, redirecting to the log-in page if necessary.
+    If the raise_exception parameter is given the PermissionDenied exception
+    is raised.
+    """
+
+    def check_perms(user):
+
+        for perm in perms:
+            # First check if the user has the permission (even anon users)
+            if user.has_perm(perm):
+                return True
+        # In case the 403 handler should be called raise the exception
+        if raise_exception:
+            raise PermissionDenied
+        # As the last resort, show the login form
+        return False
+
+    return user_passes_test(check_perms, login_url=login_url)
+
+
+def all_permission_required(perms, login_url=None, raise_exception=False):
+    """
+    Decorator for views that checks whether user has all permission
+    enabled in perms list, redirecting to the log-in page if necessary.
+    If the raise_exception parameter is given the PermissionDenied exception
+    is raised.
+    """
+
+    def check_perms(user):
+        # First check if the user has the permission (even anon users)
+        if user.has_perms(perms):
+            return True
+        # In case the 403 handler should be called raise the exception
+        if raise_exception:
+            raise PermissionDenied
+        # As the last resort, show the login form
+        return False
+
+    return user_passes_test(check_perms, login_url=login_url)

{djgentelella-0.3.9 → djgentelella-0.3.11}/djgentelella/management/commands/loaddevstatic.py

@@ -287,23 +287,7 @@ class Command(BaseCommand):
                 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js',
                 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.css'
             ],
-
-            'bootstrap-colorpicker': [
-                # 'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-colorpicker/3.4.0/js/bootstrap-colorpicker.min.js',
-                # 'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-colorpicker/3.4.0/css/bootstrap-colorpicker.css'
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css',
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min.js'
-            ],
             "img/": [],
-            "img/bootstrap-colorpicker": [
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/img/bootstrap-colorpicker/alpha.png',
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/img/bootstrap-colorpicker/hue.png',
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/img/bootstrap-colorpicker/saturation.png',
-
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/img/bootstrap-colorpicker/alpha-horizontal.png',
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/img/bootstrap-colorpicker/hue-horizontal.png',
-                'https://colorlib.com/polygon/vendors/mjolnic-bootstrap-colorpicker/dist/img/bootstrap-colorpicker/saturation-horizontal.png',
-            ],
             'bootstrap-tree': [
                 'https://github.com/patternfly/patternfly-bootstrap-treeview/raw/master/dist/bootstrap-treeview.min.js',
                 'https://raw.githubusercontent.com/patternfly/patternfly-bootstrap-treeview/master/dist/bootstrap-treeview.min.css'

{djgentelella-0.3.9 → djgentelella-0.3.11}/djgentelella/static/gentelella/js/base/select2related.js

@@ -16,6 +16,21 @@ function extract_select2_context(context, instance){
     }
 }
 
+function add_selected_option(item, data){
+    if(!data.selected) return;
+
+    itemjq = $(item.id);
+    if (itemjq.find("option[value='" + data.id + "']").length) {
+        itemjq.find("option[value='" + data.id + "']").attr('selected', 'selected');
+
+    } else {
+        // Create a DOM Option and pre-select by default
+        var newOption = new Option(data.text, data.id, true, true);
+        // Append it to the select
+        itemjq.append(newOption).trigger('change');
+    }
+}
+
 window.extract_select2_context=extract_select2_context;
 $.fn.select2related = function(action, relatedobjs=[]) {
     /**
@@ -38,7 +53,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
             for(let x=0; x<this.relatedobjs.length; x++){
                 let contexts2={};
                 extract_select2_context(contexts2, $(this.relatedobjs[x]['id']));
-                $(this.relatedobjs[x]['id']).select2(contexts2);
+                this.relatedobjs[x]['s2']=$(this.relatedobjs[x]['id']).select2(contexts2);
             }
         }
 
@@ -50,6 +65,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                         url: this.relatedobjs[x]['url'],
                         type: 'GET',
                         dataType: 'json',
+                        processResults: function (data, params) {
+                            for(let rx=0; rx<data.results.length; rx++){
+                                add_selected_option(parent.relatedobjs[x], data.results[rx]);
+                            }
+                            return data;
+                        },
                         data: function (params) {
                               var dev= {
                                 selected: get_selected_values($(parent.relatedobjs[x]['id']).find(':selected')),
@@ -58,11 +79,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                               };
                               $(parent.relatedobjs[x]['id']).trigger('relautocompletedata', dev);
                               return dev;
-                        },
+                        }
                       }
                 };
                 extract_select2_context(contexts2, $(this.relatedobjs[x]['id']));
-                $(this.relatedobjs[x]['id']).select2(contexts2);
+                this.relatedobjs[x]['s2']=$(this.relatedobjs[x]['id']).select2(contexts2);
+
             }
         }
         if(action === "related"){
@@ -73,6 +95,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                     url: this.relatedobjs[x]['url'],
                     type: 'GET',
                     dataType: 'json',
+                    processResults: function (data, params) {
+                        for(let rx=0; rx<data.results.length; rx++){
+                            add_selected_option(parent.relatedobjs[x], data.results[rx]);
+                        }
+                        return data;
+                    },
                     data: function (params) {
                       var dev = {
                         relfield: get_selected_values($(parent.relatedobjs[x-1]['id']).find(':selected')),
@@ -87,6 +115,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                 };
                 extract_select2_context(contexts2, $(this.relatedobjs[x]['id']));
                 let newselect = $(this.relatedobjs[x]['id']).select2(contexts2);
+                this.relatedobjs[x]['s2'] = newselect;
                 if(parent.relatedobjs[x]['start_empty']){
                     newselect.val(null).trigger('change');
                 }
@@ -97,6 +126,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                 url: parent.relatedobjs[0]['url'],
                 type: 'GET',
                 dataType: 'json',
+                processResults: function (data, params) {
+                    for(let rx=0; rx<data.results.length; rx++){
+                            add_selected_option(parent.relatedobjs[0], data.results[rx]);
+                    }
+                    return data;
+                },
                 data: function (params) {
                       return {
                         selected: get_selected_values($(parent.relatedobjs[0]['id']).find(':selected')),
@@ -108,6 +143,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
             };
             extract_select2_context(contexts2empty, $(this.relatedobjs[0]['id']));
             let newselect = $(this.relatedobjs[0]['id']).select2(contexts2empty);
+            this.relatedobjs[0]['id']=newselect;
             if(this.relatedobjs[0]['start_empty']){
                 newselect.val(null).trigger('change');
             }

{djgentelella-0.3.9 → djgentelella-0.3.11}/djgentelella/static/gentelella/js/base.js

@@ -450,6 +450,21 @@ function extract_select2_context(context, instance){
     }
 }
 
+function add_selected_option(item, data){
+    if(!data.selected) return;
+
+    itemjq = $(item.id);
+    if (itemjq.find("option[value='" + data.id + "']").length) {
+        itemjq.find("option[value='" + data.id + "']").attr('selected', 'selected');
+
+    } else {
+        // Create a DOM Option and pre-select by default
+        var newOption = new Option(data.text, data.id, true, true);
+        // Append it to the select
+        itemjq.append(newOption).trigger('change');
+    }
+}
+
 window.extract_select2_context=extract_select2_context;
 $.fn.select2related = function(action, relatedobjs=[]) {
     /**
@@ -472,7 +487,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
             for(let x=0; x<this.relatedobjs.length; x++){
                 let contexts2={};
                 extract_select2_context(contexts2, $(this.relatedobjs[x]['id']));
-                $(this.relatedobjs[x]['id']).select2(contexts2);
+                this.relatedobjs[x]['s2']=$(this.relatedobjs[x]['id']).select2(contexts2);
             }
         }
 
@@ -484,6 +499,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                         url: this.relatedobjs[x]['url'],
                         type: 'GET',
                         dataType: 'json',
+                        processResults: function (data, params) {
+                            for(let rx=0; rx<data.results.length; rx++){
+                                add_selected_option(parent.relatedobjs[x], data.results[rx]);
+                            }
+                            return data;
+                        },
                         data: function (params) {
                               var dev= {
                                 selected: get_selected_values($(parent.relatedobjs[x]['id']).find(':selected')),
@@ -492,11 +513,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                               };
                               $(parent.relatedobjs[x]['id']).trigger('relautocompletedata', dev);
                               return dev;
-                        },
+                        }
                       }
                 };
                 extract_select2_context(contexts2, $(this.relatedobjs[x]['id']));
-                $(this.relatedobjs[x]['id']).select2(contexts2);
+                this.relatedobjs[x]['s2']=$(this.relatedobjs[x]['id']).select2(contexts2);
+
             }
         }
         if(action === "related"){
@@ -507,6 +529,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                     url: this.relatedobjs[x]['url'],
                     type: 'GET',
                     dataType: 'json',
+                    processResults: function (data, params) {
+                        for(let rx=0; rx<data.results.length; rx++){
+                            add_selected_option(parent.relatedobjs[x], data.results[rx]);
+                        }
+                        return data;
+                    },
                     data: function (params) {
                       var dev = {
                         relfield: get_selected_values($(parent.relatedobjs[x-1]['id']).find(':selected')),
@@ -521,6 +549,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                 };
                 extract_select2_context(contexts2, $(this.relatedobjs[x]['id']));
                 let newselect = $(this.relatedobjs[x]['id']).select2(contexts2);
+                this.relatedobjs[x]['s2'] = newselect;
                 if(parent.relatedobjs[x]['start_empty']){
                     newselect.val(null).trigger('change');
                 }
@@ -531,6 +560,12 @@ $.fn.select2related = function(action, relatedobjs=[]) {
                 url: parent.relatedobjs[0]['url'],
                 type: 'GET',
                 dataType: 'json',
+                processResults: function (data, params) {
+                    for(let rx=0; rx<data.results.length; rx++){
+                            add_selected_option(parent.relatedobjs[0], data.results[rx]);
+                    }
+                    return data;
+                },
                 data: function (params) {
                       return {
                         selected: get_selected_values($(parent.relatedobjs[0]['id']).find(':selected')),
@@ -542,6 +577,7 @@ $.fn.select2related = function(action, relatedobjs=[]) {
             };
             extract_select2_context(contexts2empty, $(this.relatedobjs[0]['id']));
             let newselect = $(this.relatedobjs[0]['id']).select2(contexts2empty);
+            this.relatedobjs[0]['id']=newselect;
             if(this.relatedobjs[0]['start_empty']){
                 newselect.val(null).trigger('change');
             }

{djgentelella-0.3.9 → djgentelella-0.3.11}/djgentelella/static/gentelella/js/widgets.js

@@ -156,6 +156,7 @@ document.gtwidgets = {
         instance.addselectwidget();
         instance.each(function (i, e) {
             let contexts2={};
+            let s2instance=$(e);
             extract_select2_context(contexts2, s2instance);
             s2instance.select2(contexts2);
         });
@@ -164,6 +165,7 @@ document.gtwidgets = {
         instance.addselectwidget();
         instance.each(function (i, e) {
             let contexts2={};
+            let s2instance=$(e);
             extract_select2_context(contexts2, s2instance);
             s2instance.select2(contexts2);
         });
@@ -208,18 +210,6 @@ document.gtwidgets = {
     NumberKnobInput: function (instance) {
         instance.knob();
     },
-    DefaultColorInput: function (instance) {
-        instance.colorpicker();
-    },
-    StyleColorInput: function (instance) {
-        instance.parent('.color-input-field').colorpicker();
-    },
-    HorizontalBarColorInput: function (instance) {
-        instance.colorpicker({ horizontal: true });
-    },
-    VerticalBarColorInput: function (instance) {
-        instance.colorpicker({ format: 'rgb' });
-    },
     TextareaWysiwyg: function (instance) {
         $(instance).removeAttr('required');
         instance.tinymce({
@@ -268,9 +258,6 @@ document.gtwidgets = {
         });
     },
 
-    InlinePickerColor: function (instance) {
-        instance.parent('.color-input-field-inline-picker').css("display", "inline-block").colorpicker({ container: true, inline: true });
-    },
     TaggingInput: function (instance) {
         instance.tagify();
     },