Sync => modules

PE affiliation - basic data model

.gitattributes

@@ -1 +1 @@
-VERSION merge=keeplocal filter=version
+VERSION merge=keeplocal

VERSION

@@ -1 +1 @@
-r3189 (2012-02-08 21:50:37)
+1a3cd6a (2012-02-09 13:07:19)

controllers/pr.py

@@ -314,6 +314,18 @@ def pentity():
 
     return s3_rest_controller()
 
+# -----------------------------------------------------------------------------
+def affiliation():
+    """ RESTful CRUD controller """
+
+    return s3_rest_controller()
+
+# -----------------------------------------------------------------------------
+def role():
+    """ RESTful CRUD controller """
+
+    return s3_rest_controller()
+
 # -----------------------------------------------------------------------------
 def tooltip():
     """ Ajax tooltips """

controllers/sync.py

@@ -51,8 +51,7 @@ def repository():
     tabs = [(T("Configuration"), None),
             (T("Resources"), "task"),
             (T("Schedule"), "job"),
-            (T("Log"), "log"),
-            (T("Manual Sync"), "now")
+            (T("Log"), "log")
            ]
 
     s3mgr.model.set_method("sync", "repository",
@@ -85,7 +84,7 @@ def postp(r, output):
         return output
     response.s3.postp = postp
 
-    rheader = lambda r: sync_rheader(r, tabs=tabs)
+    rheader = lambda r: s3db.sync_rheader(r, tabs=tabs)
     output = s3_rest_controller(prefix, resourcename, rheader=rheader)
     return output
 

models/00_tables.py

@@ -37,6 +37,7 @@
 import eden.support
 import eden.survey
 import eden.hms
+import eden.sync
 #import eden.patient
 
 # =============================================================================
@@ -238,6 +239,7 @@ def s3_meta_fields():
 scheduler_task_id = S3ReusableField("scheduler_task_id",
                                     "reference %s" % s3base.S3Task.TASK_TABLENAME,
                                     ondelete="CASCADE")
+s3.scheduler_task_id = scheduler_task_id
 
 # =============================================================================
 # Reusable roles fields for map layer permissions management (GIS)