Correct view "deletion" (closes #637)

3 files changed, 10 insertions, 6 deletions

diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index 00bfb3bfb..3d619e256 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -1303,11 +1303,13 @@ class FileByDepartment(models.Model):
     '''
     Database view: don't forget to create it
 
-    create view file_department (department_id, file_id) as
-        select town."departement_id", file_towns."file_id"
+    create view file_department (id, department_id, file_id) as
+        select town."id", town."departement_id", file_towns."file_id"
             from ishtar_base_town town
         inner join ishtar_base_file_towns file_towns on
             file_towns."town_id"=town."id" order by town."departement_id";
+    CREATE RULE file_department_delete
+                            AS ON DELETE TO file_department DO INSTEAD();
     '''
     file = models.ForeignKey(File, verbose_name=_(u"File"))
     department = models.ForeignKey(Departement, verbose_name=_(u"Department"),
@@ -1470,11 +1472,13 @@ class OperationByDepartment(models.Model):
     '''
     Database view: don't forget to create it
 
-    create view operation_department (department_id, operation_id) as
-        select town."departement_id", operation_towns."operation_id"
+    create view operation_department (id, department_id, operation_id) as
+        select town."id", town."departement_id", operation_towns."operation_id"
             from ishtar_base_town town
         inner join ishtar_base_operation_towns operation_towns on
             operation_towns."town_id"=town."id" order by town."departement_id";
+    CREATE RULE operation_department_delete
+                            AS ON DELETE TO operation_department DO INSTEAD();
     '''
     operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"))
     department = models.ForeignKey(Departement, verbose_name=_(u"Department"),
diff --git a/ishtar/ishtar_base/views.py b/ishtar/ishtar_base/views.py
index 46a1b0001..ba69086c0 100644
--- a/ishtar/ishtar_base/views.py
+++ b/ishtar/ishtar_base/views.py
@@ -244,7 +244,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
         page_nb = 1
         try:
             row_nb = int(request_items.get('rows'))
-        except ValueError:
+        except (ValueError, TypeError):
             row_nb = None
         if row_nb:
             try:
diff --git a/ishtar/ishtar_base/widgets.py b/ishtar/ishtar_base/widgets.py
index bff9aeca6..00f185b5a 100644
--- a/ishtar/ishtar_base/widgets.py
+++ b/ishtar/ishtar_base/widgets.py
@@ -293,7 +293,7 @@ class JQueryJqGrid(forms.RadioSelect):
             var mygrid = jQuery("#grid_%(name)s");

             var url = "%(source)s?submited=1&" + data;

             mygrid.setGridParam({url:url});

-            mygrid.trigger("unloadGrid");

+            mygrid.trigger("reloadGrid");

             return false;

           });