Merge branch 'make_view_edit_view_into_tab' of...

Merge branch 'make_view_edit_view_into_tab' of github.com:aptivate/internewshid into make_view_edit_view_into_tab

django/website/hid/tables.py

@@ -29,6 +29,9 @@ class ItemTable(tables.Table):
         format=settings.SHORT_DATETIME_FORMAT,
     )
     body = tables.Column(verbose_name=_('Message'))
+    network_provider = tables.Column(
+        verbose_name=_('Network Provider')
+    )
     category = tables.TemplateColumn(
         template_name='hid/categories_column.html',
         accessor='terms'

django/website/hid/widgets/table.py

@@ -40,7 +40,7 @@ class TableWidget(object):
             items,
             categories=[],
             orderable=False,
-            exclude=('category', 'delete')
+            exclude=('category', 'select_item', 'network_provider')
         )
 
         # And return context