Merge pull request #273 from naxa-developers/multiple-partner

user
naxa-developers · May 12, 2021 · b438e7e · b438e7e
2 parents ace180d + a5ec51e
commit b438e7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/dashboard/templates/five_list.html b/dashboard/templates/five_list.html
@@ -118,7 +118,7 @@
         {% if messages.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
         <div class="alert alert-danger alert-dismissible">
             <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
-            <strong></strong> {{messages}} <a href="https://admin.dvs-nepal.org/media/errordata.csv">View Error</a>
+            <strong></strong> {{messages}} <a href="{{domain}}/media/errordata.csv">View Error</a>
         </div>
         {% elif messages.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}
         <div class="alert alert-success alert-dismissible">
@@ -202,7 +202,7 @@
             <div class="paging-left">
                 <div class="page-item">
                     <p>Showing <span class="show-start">1</span>to<span class="show-end">100</span>of<span
-                            class="total-entries"></span>{{ page_obj.paginator.num_pages }}</p>
+                            class="total-entries"></span>{{ total_objects }}</p>
                 </div>
 
             </div>
@@ -473,7 +473,7 @@ <h4>Are you sure you would like to clear selected data. This may result in perma
                 type: "GET",
                 url: "/dashboard/export/?full_data='full_data'{% if partnerdata %}{% for x in partnerdata %}&partner={{x}}{% endfor %}{% endif %}{% if programdata %}{% for x in programdata %}&program={{x}}{% endfor %}{% endif %}{% if projectdata %}{% for x in projectdata %}&project={{x}}{% endfor %}{% endif %}{% if provincedata %}{% for x in provincedata %}&province={{x}}{% endfor %}{% endif %}{% if districtdata %}{% for x in districtdata %}&district={{x}}{% endfor %}{% endif %}{% if municipalitydata %}{% for x in municipalitydata %}&gapanapa={{x}}{% endfor %}{% endif %}",
             }).done(function() {
-                location.href = 'https://admin.dvs-nepal.org/media/exportdata.csv';
+                location.href = '{{domain}}/media/exportdata.csv';
 
             });
         });

diff --git a/dashboard/views.py b/dashboard/views.py
@@ -1034,6 +1034,8 @@ def get_context_data(self, **kwargs):
                 'provincedata': provincedata,
                 'municipalitydata': municipalitydata,
                 'districtdata': districtdata,
+                'domain': settings.SITE_URL,
+                'total_objects': five.count()
 
             }
             return data
@@ -1105,6 +1107,8 @@ def get_context_data(self, **kwargs):
             data['gapanapa'] = gapanapa
             data['active'] = 'five'
             data['five'] = five
+            data['domain'] = settings.SITE_URL
+            data['total_objects'] = five.count()
             return data