Merge pull request #59 from Elthan/master

CSV bug fix, CSS updates, and Error pages

trix/project/default/settings.py

@@ -46,6 +46,7 @@
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
@@ -69,6 +70,8 @@
 USE_L10N = True
 USE_TZ = True
 
+# https://docs.djangoproject.com/en/1.11/ref/clickjacking/
+# X_FRAME_OPTIONS = 'DENY'
 
 # Setup static files to be served at /s/.
 # - Gives us short urls for angular apps (I.E.: /s/v1/).

trix/project/production/settings.py

@@ -4,7 +4,6 @@
 ROOT_URLCONF = 'trix.project.production.urls'
 
 DEBUG = False
-TEMPLATE_DEBUG = False
 LANGUAGE_CODE = 'nb'
 
 # Database

trix/trix_admin/locale/nb/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trix_admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-01 19:59+0200\n"
+"POT-Creation-Date: 2018-08-03 19:26+0200\n"
 "PO-Revision-Date: 2015-01-08 12:35+0100\n"
 "Last-Translator: Espen Angell Kristiansen <post@espenak.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -211,7 +211,7 @@ msgstr "Slett tag"
 msgid "Type in the tag you want to remove from the selected assignments"
 msgstr "Skriv inn taggen du vil fjerne fra valgte oppgaver"
 
-#: trix/trix_admin/views/roleselect.py:7
+#: trix/trix_admin/views/roleselect.py:9
 msgid "Select a course"
 msgstr "Velg et kurs"
 
@@ -237,18 +237,18 @@ msgstr "Prosent"
 msgid "Number"
 msgstr "Antall"
 
-#: trix/trix_admin/views/statistics.py:202
+#: trix/trix_admin/views/statistics.py:208
 msgid "Title"
 msgstr "Tittel"
 
-#: trix/trix_admin/views/statistics.py:203
+#: trix/trix_admin/views/statistics.py:209
 msgid "Date created"
 msgstr "Dato opprettet"
 
-#: trix/trix_admin/views/statistics.py:204
+#: trix/trix_admin/views/statistics.py:210
 msgid "Last updated"
 msgstr "Sist oppdatert"
 
-#: trix/trix_admin/views/statistics.py:233
+#: trix/trix_admin/views/statistics.py:239
 msgid "Number of assignments"
 msgstr "Antall oppgaver"

trix/trix_admin/templates/trix_admin/statistics.django.html

@@ -66,7 +66,7 @@ <h1>{% trans "Aggregated statistics on how the assignments where solved" %}</h1>
                 <span class="btn trix-sort-button">
                     {% order_in_use order sort_list as is_negative %}
                     <a href="?{% url_replace 'ordering' '' %}"
-                    style="float: left;{% if order not in sort_list %}visibility:hidden;{% endif %}">
+                    style="{% if order not in sort_list %}visibility:hidden;{% endif %}">
                         <span class="fa fa-times"></span>
                     </a>
                     <a class="btn btn-link"

trix/trix_admin/views/roleselect.py

@@ -1,5 +1,7 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
+from django.core.exceptions import PermissionDenied
+
 from cradmin_legacy.views import roleselect
 
 
@@ -13,3 +15,9 @@ def get_context_data(self, **kwargs):
         context['TRIX_ADMIN_DOCUMENTATION_URL'] = settings.TRIX_ADMIN_DOCUMENTATION_URL
         context['TRIX_ADMIN_DOCUMENTATION_LABEL'] = settings.TRIX_ADMIN_DOCUMENTATION_LABEL
         return context
+
+    def get(self, request):
+        if request.user.is_admin_on_anything():
+            return super(TrixRoleSelectView, self).get(request)
+        else:
+            raise PermissionDenied

trix/trix_admin/views/statistics.py

@@ -133,7 +133,7 @@ def get(self, request, *args, **kwargs):
 
         try:
             response['Content-Disposition'] = 'attachment; filename="trix-statistics.csv"'
-            csvwriter = UnicodeWriter(response, dialect='semicolons', encoding="utf-8")
+            csvwriter = UnicodeWriter(response, dialect='semicolons', encoding="utf-16")
             csvwriter.writerow([_('Simple statistics showing percentage share of how the '
                                   'assignments where solved')])
             csvwriter.writerow([_('Total number of users'), str(user_count)])
@@ -164,6 +164,12 @@ def get(self, request, *args, **kwargs):
             raise e
         return response
 
+    def get_queryset(self):
+        queryset = trix_models.Assignment.objects.all().order_by('title')
+        for tagstring in self.tags:
+            queryset = queryset.filter(tags__tag=tagstring)
+        return queryset
+
 
 class StatisticsChartView(AssignmentStatsMixin, ListView):
     """

trix/trix_core/locale/nb/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trix_core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-01 19:59+0200\n"
+"POT-Creation-Date: 2018-08-03 19:26+0200\n"
 "PO-Revision-Date: 2014-12-21 22:43+0100\n"
 "Last-Translator: Tor Ivar Johansen <tor@appresso.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -185,6 +185,3 @@ msgid ""
 msgstr ""
 "En eller flere av den gitte IDen ble ikke funnet blant oppgavene "
 "tilgjengelig via \"%(course_tag)s\"."
-
-#~ msgid "Is admin?"
-#~ msgstr "Er admin?"

trix/trix_core/templatetags/trix_core_tags.py

@@ -28,9 +28,9 @@ def url_replace(context, field, value):
             pass
     else:
         dict_[field] = value
-    print(dict_)
     return dict_.urlencode()
 
+
 @register.filter
 def add_string_list(string_list, item):
     return string_list + ',' + item

trix/trix_student/locale/nb/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trix_student\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-01 19:59+0200\n"
+"POT-Creation-Date: 2018-08-03 19:26+0200\n"
 "PO-Revision-Date: 2015-01-03 17:40+0100\n"
 "Last-Translator: Espen Angell Kristiansen <post@espenak.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.5\n"
 
+#: trix/trix_student/templates/400.html:11
+msgid "Bad request!"
+msgstr "Dårlig forespørsel!"
+
+#: trix/trix_student/templates/403.html:11
+msgid "You do not have access to this page!"
+msgstr "Du har ikke tilgang til denne siden!"
+
+#: trix/trix_student/templates/404.html:11
+msgid "The page could not be found!"
+msgstr "Fant ikke siden!"
+
+#: trix/trix_student/templates/500.html:11
+msgid "Something went wrong!"
+msgstr "Noe gikk galt!"
+
 #: trix/trix_student/templates/trix_student/assignment_list_base.django.html:5
 #: trix/trix_student/templates/trix_student/assignments.django.html:3
 #: trix/trix_student/templates/trix_student/assignments.django.html:8
@@ -38,8 +54,6 @@ msgid "Filter"
 msgstr "Filtrer"
 
 #: trix/trix_student/templates/trix_student/assignment_list_base.django.html:61
-#, fuzzy
-#| msgid "Filter"
 msgid "Filter out"
 msgstr "Filtrer"
 
@@ -182,16 +196,16 @@ msgstr "Profil"
 msgid "Sign out"
 msgstr "Logg ut"
 
-#: trix/trix_student/templates/trix_student/include/pager.django.html:33
+#: trix/trix_student/templates/trix_student/include/pager.django.html:32
 msgid "Previous"
 msgstr "Forrige"
 
-#: trix/trix_student/templates/trix_student/include/pager.django.html:37
+#: trix/trix_student/templates/trix_student/include/pager.django.html:36
 #, python-format
 msgid "Page %(number)s of %(total)s"
 msgstr "Side %(number)s av %(total)s"
 
-#: trix/trix_student/templates/trix_student/include/pager.django.html:46
+#: trix/trix_student/templates/trix_student/include/pager.django.html:45
 msgid "Next"
 msgstr "Neste"
 
@@ -229,8 +243,6 @@ msgid "All the permalinks created are listed below"
 msgstr "Under listes alle permalinker opp"
 
 #: trix/trix_student/templates/trix_student/users.django.html:6
-#, fuzzy
-#| msgid "Username"
 msgid "User"
 msgstr "Brukernavn"
 
@@ -284,6 +296,3 @@ msgstr "Administrator for "
 #: trix/trix_student/views/users.py:30
 msgid "Student"
 msgstr "Student"
-
-#~ msgid "Superuser panel"
-#~ msgstr "Superbruker panel"