Fix for default filters & stop disabling merge links in hrm/person (D…

…ominic pls review both)
flavour · Mar 24, 2014 · 50f6941 · 50f6941
1 parent 2b400ad
commit 50f6941
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-f3d3afa (2014-03-24 11:07:38)
+2b400ad (2014-03-24 12:05:40)
diff --git a/modules/s3/s3filter.py b/modules/s3/s3filter.py
@@ -2097,6 +2097,8 @@ def apply_filter_defaults(request, resource):
                 if isinstance(applicable_defaults, dict):
                     if operator in applicable_defaults:
                         default = applicable_defaults[operator]
+                    else:
+                        continue
                 elif operator in (None, "belongs", "eq"):
                     default = applicable_defaults
                 else:

diff --git a/modules/s3db/hrm.py b/modules/s3db/hrm.py
@@ -184,7 +184,8 @@ def model(self):
                                 ondelete = "SET NULL")
 
         configure("hrm_department",
-                  deduplicate=self.hrm_department_duplicate)
+                  deduplicate = self.hrm_department_duplicate,
+                  )
 
         # =========================================================================
         # Job Titles (Mayon: StaffResourceType)
@@ -294,7 +295,8 @@ def model(self):
             )
 
         configure("hrm_job_title",
-                  deduplicate=self.hrm_job_title_duplicate)
+                  deduplicate = self.hrm_job_title_duplicate,
+                  )
 
         # =========================================================================
         # Human Resource
@@ -1711,7 +1713,7 @@ def model(self):
                                         ondelete = "RESTRICT")
 
         configure("hrm_competency_rating",
-                  deduplicate = self.hrm_competency_rating_duplicate
+                  deduplicate = self.hrm_competency_rating_duplicate,
                   )
 
         # ---------------------------------------------------------------------
@@ -3394,7 +3396,7 @@ def model(self):
 
         configure(tablename,
                   deduplicate = self.hrm_programme_duplicate,
-                 )
+                  )
 
         # Components
         self.add_components(tablename,
@@ -5792,8 +5794,8 @@ def postp(r, output):
                  csv_extra_fields=[dict(label="Type",
                                         field=s3db.hrm_human_resource.type),
                                   ],
-                 # Better in the native person controller:
-                 deduplicate="",
+                 # Better in the native person controller (but this isn't always accessible):
+                 #deduplicate="",
                  orgname=orgname,
                  replace_option=T("Remove existing data before import"),
                  rheader=hrm_rheader,