Denis K 9 лет назад
Родитель
Сommit
b125900cb1
3 измененных файлов с 9 добавлено и 6 удалено
  1. 3 2
      jet/forms.py
  2. 4 2
      jet/modules.py
  3. 2 2
      jet/views.py

+ 3 - 2
jet/forms.py

@@ -10,6 +10,7 @@ except ImportError:
 import operator
 import operator
 from jet.models import Bookmark, PinnedApplication, UserDashboardModule
 from jet.models import Bookmark, PinnedApplication, UserDashboardModule
 from jet.utils import get_current_dashboard, get_model_instance_label
 from jet.utils import get_current_dashboard, get_model_instance_label
+from functools import reduce
 
 
 
 
 class AddBookmarkForm(forms.ModelForm):
 class AddBookmarkForm(forms.ModelForm):
@@ -235,10 +236,10 @@ class ModelLookupForm(forms.Form):
         page = self.cleaned_data['page'] or 1
         page = self.cleaned_data['page'] or 1
         offset = (page - 1) * limit
         offset = (page - 1) * limit
 
 
-        items = map(
+        items = list(map(
             lambda instance: {'id': instance.pk, 'text': get_model_instance_label(instance)},
             lambda instance: {'id': instance.pk, 'text': get_model_instance_label(instance)},
             qs.all()[offset:offset + limit]
             qs.all()[offset:offset + limit]
-        )
+        ))
         total = qs.count()
         total = qs.count()
 
 
         return items, total
         return items, total

+ 4 - 2
jet/modules.py

@@ -129,7 +129,7 @@ class LinkList(DashboardModule):
     child_name_plural = _('Links')
     child_name_plural = _('Links')
 
 
     def __init__(self, title=None, children=list(), **kwargs):
     def __init__(self, title=None, children=list(), **kwargs):
-        children = map(self.parse_link, children)
+        children = list(map(self.parse_link, children))
         kwargs.update({'children': children})
         kwargs.update({'children': children})
         super(LinkList, self).__init__(title, **kwargs)
         super(LinkList, self).__init__(title, **kwargs)
 
 
@@ -184,8 +184,9 @@ class AppList(DashboardModule):
                 lambda model: self.exclude is None or model['object_name'] not in self.exclude and app['app_label'] + '.*' not in self.exclude,
                 lambda model: self.exclude is None or model['object_name'] not in self.exclude and app['app_label'] + '.*' not in self.exclude,
                 app['models']
                 app['models']
             )
             )
+            app['models'] = list(app['models'])
 
 
-            if self.hide_empty and len(app['models']) == 0:
+            if self.hide_empty and len(list(app['models'])) == 0:
                 app_to_remove.append(app)
                 app_to_remove.append(app)
 
 
         for app in app_to_remove:
         for app in app_to_remove:
@@ -224,6 +225,7 @@ class ModelList(DashboardModule):
                 lambda model: self.exclude is None or model['object_name'] not in self.exclude and app['app_label'] + '.*' not in self.exclude,
                 lambda model: self.exclude is None or model['object_name'] not in self.exclude and app['app_label'] + '.*' not in self.exclude,
                 app['models']
                 app['models']
             )
             )
+            app['models'] = list(app['models'])
 
 
             models.extend(app['models'])
             models.extend(app['models'])
 
 

+ 2 - 2
jet/views.py

@@ -63,10 +63,10 @@ class UpdateDashboardModuleView(SuccessMessageMixin, UpdateView):
             return formset_factory(self.module.child_form, can_delete=True, extra=1)(**self.get_children_formset_kwargs())
             return formset_factory(self.module.child_form, can_delete=True, extra=1)(**self.get_children_formset_kwargs())
 
 
     def clean_children_data(self, children):
     def clean_children_data(self, children):
-        children = filter(
+        children = list(filter(
             lambda item: isinstance(item, dict) and item and item.get('DELETE') is not True,
             lambda item: isinstance(item, dict) and item and item.get('DELETE') is not True,
             children
             children
-        )
+        ))
         for item in children:
         for item in children:
             item.pop('DELETE')
             item.pop('DELETE')
         return children
         return children