Add adminReport and freeUserReport flags

translate · Oct 24, 2014 · 4eed59c · 4eed59c
1 parent 2e5aa2d
commit 4eed59c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/pootle/apps/evernote_reports/views.py b/pootle/apps/evernote_reports/views.py
@@ -124,6 +124,7 @@ def evernote_reports(request):
         'user_rates_form': UserRatesForm(),
         'paid_task_form': PaidTaskForm(),
         'now': timezone.now().strftime('%Y-%m-%d %H-%M-%S'),
+        'admin_report': True,
     }
 
     return render_to_response('admin/reports.html', ctx,

diff --git a/pootle/static/js/reports.js b/pootle/static/js/reports.js
@@ -9,15 +9,15 @@
       /* Compile templates */
       this.tmpl = {
         results: _.template($('#language_user_activity').html()),
-        summary: PTL.reports.userReport ? '' : _.template($('#summary').html()),
-        paid_tasks: PTL.reports.userReport ? '' : _.template($('#paid-tasks').html()),
+        summary: PTL.reports.freeUserReport ? '' : _.template($('#summary').html()),
+        paid_tasks: PTL.reports.freeUserReport ? '' : _.template($('#paid-tasks').html()),
       };
 
       $(window).resize(function() {
         PTL.reports.drawChart();
       });
 
-      if (!PTL.reports.userReport) {
+      if (PTL.reports.adminReport) {
         $(document).on('change', '#reports-user', function (e) {
           PTL.reports.userName = $('#reports-user').val();
           PTL.reports.update();
@@ -265,7 +265,7 @@
             PTL.reports.drawChart();
           }
           PTL.reports.setData(data);
-          if (!PTL.reports.userReport) {
+          if (!PTL.reports.freeUserReport) {
             $('#reports-paid-tasks').html(PTL.reports.tmpl.paid_tasks(PTL.reports.data));
             $('#reports-summary').html(PTL.reports.tmpl.summary(PTL.reports.data));
           }
@@ -360,7 +360,7 @@
     updateMonthSelector: function () {
       $('.js-month').each(function () {
         var $el = $(this),
-            link = PTL.reports.userReport ? '#' : '#username=' + PTL.reports.userName + '&';
+            link = PTL.reports.adminReport ? '#username=' + PTL.reports.userName + '&' : '#';
 
         if ($el.hasClass('js-previous')) {
           link += 'month=' + PTL.reports.month.clone().subtract({M:1}).format('YYYY-MM');

diff --git a/pootle/templates/admin/reports.html b/pootle/templates/admin/reports.html
@@ -35,6 +35,8 @@
     PTL.reports.removePaidTaskUrl = "{% url 'evernote-remove-paid-task' %}";
     PTL.reports.serverTime = "{{ now }}";
     PTL.reports.detailedUrl = "{% url 'evernote-reports-detailed' %}";
+    PTL.reports.adminReport = true;
+    PTL.reports.freeUserReport = false;
   {% endautoescape %}
 </script>
 

diff --git a/pootle/templates/user/report.html b/pootle/templates/user/report.html
@@ -24,7 +24,8 @@
 <script type="text/javascript">
   {% autoescape off %}
     PTL.reports.serverTime = "{{ now }}";
-    PTL.reports.userReport = true;
+    PTL.reports.freeUserReport = {% if object.rate == 0 %}true{% else %}false{% endif %};
+    PTL.reports.adminReport = false;
     PTL.reports.userName = "{{ object.username }}";
     PTL.reports.detailedUrl = "{% url 'pootle-user-detailed-report' object.username %}";
   {% endautoescape %}