Vol: Fix regression #1583

PR: Minor Optimisation
sahana · Mar 12, 2022 · 845e9af · 845e9af
1 parent b3b04b1
commit 845e9af
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-eden-dev-c7c0f3101 (2022-02-08 15:56:38)
+eden-dev-b3b04b117 (2022-03-12 16:26:34)
diff --git a/modules/s3db/pr.py b/modules/s3db/pr.py
@@ -734,7 +734,7 @@ def pr_affiliation_onaccept(form):
             db(query).update(**data)
 
             # Clear descendant paths
-            current.s3db.pr_rebuild_path(pe_id, clear=True)
+            pr_rebuild_path(pe_id, clear=True)
 
     # -------------------------------------------------------------------------
     @staticmethod
@@ -764,7 +764,7 @@ def pr_affiliation_ondelete(row):
             pe_id = deleted_fk.get("pe_id")
 
         if pe_id:
-            current.s3db.pr_rebuild_path(pe_id, clear=True)
+            pr_rebuild_path(pe_id, clear=True)
 
 # =============================================================================
 class PersonModel(S3Model):
@@ -10282,12 +10282,14 @@ def pr_role_rebuild_path(role_id, skip=None, clear=False):
                                 ).first()
     if not role:
         return None
-    pe_id = role.pe_id
 
     if role_id in skip:
         return role.path
+
     skip.add(role_id)
 
+    pe_id = role.pe_id
+
     if role.role_type != OU:
         path = None
     else:

diff --git a/modules/s3db/vol.py b/modules/s3db/vol.py
@@ -1681,7 +1681,6 @@ def prep(r):
                                               future_months = -144,
                                               )
                 table.pe_label.readable = table.pe_label.writable = False
-                table.missing.readable = table.missing.writable = False
                 table.age_group.readable = table.age_group.writable = False
 
                 s3db.pr_person_details.occupation.label = T("Normal Job")

diff --git a/static/themes/RMS/eden.min.css b/static/themes/RMS/eden.min.css