more merge changes

Author: mberg

TODOS

@@ -0,0 +1 @@
+- Add logs back

__init__.pyc

@@ -7,14 +7,14 @@ def processor(self):
     if has_roles(user, ["partner", "national", "district"]):
         tabs.append({ "link": "/", "title": "National" })
         tabs.append({ "link": "/district/", "title": "District"})
-    if has_roles(user, ["partner", "national", "district", "gmc"]):
-        tabs.append({ "link": "/gmc/", "title": "GMC"})
+    if has_roles(user, ["partner", "national", "district", "clinic"]):
+        tabs.append({ "link": "/clinic/", "title": "Clinic"})
         tabs.append({ "link": "/child/", "title": "Child"})
         tabs.append({ "link": "/hsa/", "title": "HSA"})
     if has_roles(user, ["partner", "national", "district"]):
         tabs.append({ "link": "/setup/", "title": "Setup"})
     context = {
-        "site": { "title": "Malawi",
+        "site": { "title": "RapidResponse",
                   "tabs": tabs },
         "settings": settings,
     }

apps/__init__.pyc

@@ -72,9 +72,9 @@ def has_access(request, zone=None, facility=None):
         log("National or Partner, access")
         return True
 
-    # gmc just to the facility only
-    if int(profile.role) == profile.GMC:
-        log("GMC user")
+    # clinic just to the facility only
+    if int(profile.role) == profile.CLINIC:
+        log("Clinic user")
         if facility and profile.facility == facility:
             log("Facility match, access")
             return True