HRM: Remove old hrm_vars

RMSAmericas: Permission Tweaks

VERSION

@@ -1 +1 @@
-b9ecc6e (2017-02-07 15:38:23)
+8a7daf5 (2017-02-09 01:04:49)

controllers/default.py

@@ -703,13 +703,13 @@ def auth_profile_method(r, **attr):
                     )
 
     set_method("pr", "person",
-               method="user_profile",
-               action=auth_profile_method)
+               method = "user_profile",
+               action = auth_profile_method)
 
     # Custom Method for Contacts
     set_method("pr", "person",
-               method="contacts",
-               action=s3db.pr_Contacts)
+               method = "contacts",
+               action = s3db.pr_Contacts)
 
     #if settings.has_module("asset"):
     #    # Assets as component of people
@@ -725,7 +725,7 @@ def prep(r):
             table = s3db[tablename]
 
             # Users can not delete their own person record
-            r.resource.configure(deletable=False)
+            r.resource.configure(deletable = False)
 
             s3.crud_strings[tablename].update(
                 title_display = T("Personal Profile"),
@@ -832,7 +832,8 @@ def postp(r, output):
                 output["add_btn"] = A(T("Assign Asset"),
                                       _href=URL(c="asset", f="asset"),
                                       _id="add-btn",
-                                      _class="action-btn")
+                                      _class="action-btn",
+                                      )
         return output
     s3.postp = postp
 
@@ -917,10 +918,9 @@ def postp(r, output):
             (T("My Maps"), "config"),
             ]
 
-    output = s3_rest_controller("pr", "person",
-                                rheader = lambda r, tabs=tabs: \
-                                          s3db.pr_rheader(r, tabs=tabs))
-    return output
+    return s3_rest_controller("pr", "person",
+                              rheader = lambda r, tabs=tabs: \
+                                                s3db.pr_rheader(r, tabs=tabs))
 
 # -----------------------------------------------------------------------------
 def group():
@@ -941,9 +941,7 @@ def prep(r):
         return True
     s3.prep = prep
 
-    output = s3_rest_controller("pr", "group")
-
-    return output
+    return s3_rest_controller("pr", "group")
 
 # -----------------------------------------------------------------------------
 def skill():
@@ -964,9 +962,7 @@ def prep(r):
         return True
     s3.prep = prep
 
-    output = s3_rest_controller("hrm", "skill")
-
-    return output
+    return s3_rest_controller("hrm", "skill")
 
 # -----------------------------------------------------------------------------
 def facebook():

controllers/deploy.py

@@ -10,8 +10,6 @@
 if not settings.has_module(module):
     raise HTTP(404, body="Module disabled: %s" % module)
 
-s3db.hrm_vars()
-
 # -----------------------------------------------------------------------------
 def index():
     """ Customisable module homepage """