diff options
| -rw-r--r-- | ishtar_common/static/media/style.css | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/import_list.html | 2 | ||||
| -rw-r--r-- | ishtar_common/views.py | 21 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 06c80c194..2fd56f697 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -1490,6 +1490,7 @@ table.table-form td input{ margin: 10px 0 10px 0; width: 100%; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); + border-collapse: collapse; } .clean-table h4{ @@ -1526,6 +1527,7 @@ table.table-form td input{ background: #DA2D2D; text-align: center; padding: 0.2em 0.4em; + border-right: 1px solid #fff; } .clean-table tr th.sub { diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index a33786f6b..5dba51b6f 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -29,7 +29,7 @@ <a href='{{MEDIA_URL}}{{import.imported_file}}'>{% trans "Source file" %}</a> </td> <td> - {{import.creation_date}} + {{import.creation_date}} ({{import.user}}) </td> <td> {{import.status}} diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 18bdc6e36..95b7689ec 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1629,9 +1629,11 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView): current_url = 'current_imports' def get_queryset(self): + q = self.model.objects.exclude(state='AC') + if self.request.user.is_superuser: + return q.order_by('-creation_date') user = models.IshtarUser.objects.get(pk=self.request.user.pk) - return self.model.objects.filter(user=user).exclude( - state='AC').order_by('-creation_date') + return q.filter(user=user).order_by('-creation_date') def post(self, request, *args, **kwargs): for field in request.POST: @@ -1643,10 +1645,11 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView): imprt = models.Import.objects.get(pk=int(field.split('-')[-1])) except (models.Import.DoesNotExist, ValueError): continue - # user can only edit his own imports - user = models.IshtarUser.objects.get(pk=self.request.user.pk) - if imprt.user != user: - continue + if not self.request.user.is_superuser: + # user can only edit his own imports + user = models.IshtarUser.objects.get(pk=self.request.user.pk) + if imprt.user != user: + continue action = request.POST[field] if action == 'D': return HttpResponseRedirect(reverse('import_delete', @@ -1665,9 +1668,11 @@ class ImportOldListView(ImportListView): current_url = 'old_imports' def get_queryset(self): + q = self.model.objects.filter(state='AC') + if self.request.user.is_superuser: + return q.order_by('-creation_date') user = models.IshtarUser.objects.get(pk=self.request.user.pk) - return self.model.objects.filter( - user=user, state='AC').order_by('-creation_date') + return q.filter(user=user).order_by('-creation_date') class ImportLinkView(IshtarMixin, LoginRequiredMixin, ModelFormSetView): |