Merge remote-tracking branch 'origin/master'

devilry · Jan 22, 2015 · c70095f · c70095f
2 parents 0eace72 + f10f5f4
commit c70095f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='trix',
-    description='Trix.',
+    description='Next generation Trix. Detailed task control and statistics app for better learning outcome.',
     version=__version__,   # noqa
     url='https://github.com/devilry/trix2',
     author='Tor Johansen, Espen Angell Kristiansen',

diff --git a/trix/trix_admin/templates/trix_admin/statistics.django.html b/trix/trix_admin/templates/trix_admin/statistics.django.html
@@ -1,6 +1,7 @@
 {% extends "django_cradmin/base.django.html" %}
 {% load i18n %}l
 {% load trix_admin_tags %}
+{% load cradmin_tags %}
 
 {% block content %}
     <div class="page-header">
@@ -46,7 +47,7 @@ <h1>{% trans "Aggregated statistics on how the assignments where solved" %}</h1>
                     <li>{% trans "Number of users:" %} {{ user_count }}</li>
                     <li>{% trans "Number of assignments:" %} {{ assignment_count }}</li>
                     {% if assignment_list.count  %}
-                        <li><a href="{% url 'trix_stats_ascsv' %}?tags={{ selected_tags_string }}">
+                        <li><a href="{% cradmin_appurl 'ascsv' %}?tags={{ selected_tags_string }}">
                             <span class="fa fa-download"></span>
                             {% trans "Download csv file" %}
                         </a></li>

diff --git a/trix/trix_admin/views/statistics.py b/trix/trix_admin/views/statistics.py
@@ -220,4 +220,5 @@ class App(crapp.App):
     appurls = [
         crapp.Url(r'^$', StatisticsView.as_view(), name=crapp.INDEXVIEW_NAME),
         crapp.Url(r'^view$', StatisticsChartView.as_view(), name='view'),
+        crapp.Url(r'^ascsv$', AssignmentStatsCsv.as_view(), name='ascsv'),
     ]
diff --git a/trix/trix_student/urls.py b/trix/trix_student/urls.py
@@ -18,7 +18,7 @@
     url('^course/(?P<course_id>\d+)$', course.CourseDetailView.as_view(), name='trix_student_course'),
     url('^permalink/(?P<permalink_id>\d+)$', permalink.PermalinkView.as_view(), name='trix_student_permalink'),
     url('^permalink/list/$', permalink.PermalinkListView.as_view(), name='trix_student_permalink_list_view'),
-    url(r'^statistics/ascsv$', AssignmentStatsCsv.as_view(), name='trix_stats_ascsv'),
+    #url(r'^statistics/ascsv$', AssignmentStatsCsv.as_view(), name='trix_stats_ascsv'),
     url(r'^login$', 'trix_student.views.login.loginview', name='trix-login'),
     url(r'^logout$', 'trix_student.views.logout.logoutview', name='trix-logout'),
 )
diff --git a/trix/version.py b/trix/version.py
@@ -1 +1 @@
-__version__ = '2.0.6'
+__version__ = '2.0.7'