Merge fix: re-introduce get_context_data on ViewItems

django/website/hid/views.py

@@ -97,6 +97,12 @@ class ViewItems(SingleTableView):
         kwargs['categories'] = self.get_category_options()
         return super(ViewItems, self).get_table(**kwargs)
 
+    def get_context_data(self, **kwargs):
+            context = super(ViewItems, self).get_context_data(**kwargs)
+            context['type_label'] = _('Questions')
+            context['upload_form'] = UploadForm(initial={'source': 'geopoll'})
+            return context
+
 
 def get_deleted(params):
     return [int(x) for x in params.getlist("delete", [])]