deployment_settings & Frontpage

flavour · flavour · commit b6fe4e18f1e0 · 2012-03-16T13:41:59.000Z
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2afe5f1 (2012-03-16 13:27:39)
+6e2877f (2012-03-16 13:41:59)
diff --git a/controllers/default.py b/controllers/default.py
@@ -135,139 +135,33 @@ def index():
     else:
         item = ""
 
-    if deployment_settings.has_module("cr"):
-        s3mgr.load("cr_shelter")
-        SHELTERS = s3.crud_strings["cr_shelter"].subtitle_list
-    else:
-        SHELTERS = ""
-
     # Menu Boxes
-    menu_btns = [#div, label, app, function
-                ["facility", SHELTERS, "cr", "shelter"],
-                ["facility", T("Warehouses"), "inv", "warehouse"],
-                ["facility", T("Hospitals"), "hms", "hospital"],
-                ["facility", T("Offices"), "org", "office"],
-                ["sit", T("Incidents"), "irs", "ireport"],
-                ["sit", T("Assessments"), "survey", "series"],
-                ["sit", T("Assets"), "asset", "asset"],
-                ["sit", T("Inventory Items"), "inv", "inv_item"],
-                #["dec", T("Gap Map"), "project", "gap_map"],
-                #["dec", T("Gap Report"), "project", "gap_report"],
-                ["dec", T("Requests"), "req", "req"],
-                ["res", T("Projects"), "project", "project"],
-                ["res", T("Activities"), "project", "activity"],
-                ["res", T("Commitments"), "req", "commit"],
-                ["res", T("Sent Shipments"), "inv", "send"],
-                ["res", T("Received Shipments"), "inv", "recv"]
-                ]
-
-    # Change to (Mitigation)/Preparedness/Response/Recovery?
-    menu_divs = {"facility": DIV( H3(T("Facilities")),
-                                 _id = "facility_box", _class = "menu_box"),
-                 "sit": DIV( H3(T("Situation")),
-                              _id = "menu_div_sit", _class = "menu_div"),
-                 "dec": DIV( H3(T("Decision")),
-                              _id = "menu_div_dec", _class = "menu_div"),
-                 "res": DIV( H3(T("Response")),
-                              _id = "menu_div_res", _class = "menu_div"),
-                }
-
-    for div, label, app, function in menu_btns:
-        if deployment_settings.has_module(app):
-            # @ToDo: Also check permissions (e.g. for anonymous users)
-            menu_divs[div].append(A( DIV(label,
-                                         _class = "menu-btn-r"),
-                                     _class = "menu-btn-l",
-                                     _href = URL(app,function)
-                                    )
-                                 )
-
-    div_arrow = DIV(IMG(_src = "/%s/static/img/arrow_blue_right.png" % \
-                               request.application),
-                          _class = "div_arrow")
-    sit_dec_res_box = DIV(menu_divs["sit"],
-                          div_arrow,
-                          menu_divs["dec"],
-                          div_arrow,
-                          menu_divs["res"],
-                          _id = "sit_dec_res_box",
-                          _class = "menu_box fleft swidth"
-                     #div_additional,
-                    )
-    facility_box  = menu_divs["facility"]
-    facility_box.append( A( IMG(_src = "/%s/static/img/map_icon_128.png" % \
-                                    request.application),
-                            _href = URL(c="gis", f="index"),
-                            _title = T("Map")
-                            )
-                        )
-
     datatable_ajax_source = ""
     # Check logged in AND permissions
     if AUTHENTICATED in session.s3.roles and \
-       auth.s3_has_permission("read", db.org_organisation):
-        org_items = organisation()
-        datatable_ajax_source = "/%s/default/organisation.aaData" % \
+       auth.s3_has_permission("read", s3db.project_project):
+        project_items = project()
+        datatable_ajax_source = "/%s/default/project.aaData" % \
                                 request.application
         response.s3.actions = None
         response.view = "default/index.html"
-        auth.permission.controller = "org"
-        auth.permission.function = "site"
-        permitted_facilities = auth.permission.permitted_facilities(redirect_on_error=False)
-        manage_facility_box = ""
-        if permitted_facilities:
-            facility_list = s3_represent_facilities(db, permitted_facilities,
-                                                    link=False)
-            facility_opts = [OPTION(opt[1], _value = opt[0])
-                             for opt in facility_list]
-            if facility_list:
-                manage_facility_box = DIV(H3(T("Manage Your Facilities")),
-                                    SELECT(_id = "manage_facility_select",
-                                            _style = "max-width:400px;",
-                                            *facility_opts
-                                            ),
-                                    A(T("Go"),
-                                        _href = URL(c="default", f="site",
-                                                    args=[facility_list[0][0]]),
-                                        #_disabled = "disabled",
-                                        _id = "manage_facility_btn",
-                                        _class = "action-btn"
-                                        ),
-                                    _id = "manage_facility_box",
-                                    _class = "menu_box fleft")
-                response.s3.jquery_ready.append( """
-$('#manage_facility_select').change(function() {
-    $('#manage_facility_btn').attr('href', S3.Ap.concat('/default/site/',  $('#manage_facility_select').val()));
-})""" )
-            else:
-                manage_facility_box = DIV()
-
-        org_box = DIV( H3(T("Organizations")),
-                       A(T("Add Organization"),
-                          _href = URL(c="org", f="organisation",
-                                      args=["create"]),
-                          _id = "add-btn",
-                          _class = "action-btn",
-                          _style = "margin-right: 10px;"),
-                        org_items["items"],
-                        _id = "org_box",
+        if auth.s3_has_role(ADMIN):
+            add_btn = A(T("Add Project"),
+                        _href = URL(c="project", f="project",
+                                    args=["create"]),
+                        _id = "add-btn",
+                        _class = "action-btn",
+                        _style = "margin-right: 10px;")
+        else:
+            add_btn = ""
+        project_box = DIV( H3(T("Projects")),
+                       add_btn,
+                        project_items["items"],
+                        _id = "project_box",
                         _class = "menu_box fleft"
                         )
     else:
-        manage_facility_box = ""
-        org_box = ""
-
-    # @ToDo: Replace this with an easily-customisable section on the homepage
-    #settings = db(db.s3_setting.id == 1).select(limitby=(0, 1)).first()
-    #if settings:
-    #    admin_name = settings.admin_name
-    #    admin_email = settings.admin_email
-    #    admin_tel = settings.admin_tel
-    #else:
-    #    # db empty and prepopulate is false
-    #    admin_name = T("Sahana Administrator").xml(),
-    #    admin_email = "support@Not Set",
-    #    admin_tel = T("Not Set").xml(),
+        project_box = ""
 
     # Login/Registration forms
     self_registration = deployment_settings.get_security_self_registration()
@@ -374,12 +268,7 @@ def index():
 
     return dict(title = title,
                 item = item,
-
-                sit_dec_res_box = sit_dec_res_box,
-                facility_box = facility_box,
-                manage_facility_box = manage_facility_box,
-                org_box = org_box,
-
+                project_box = project_box,
                 r = None, # Required for dataTable to work
                 datatable_ajax_source = datatable_ajax_source,
                 #admin_name=admin_name,
@@ -394,28 +283,30 @@ def index():
                 )
 
 # -----------------------------------------------------------------------------
-def organisation():
+def project():
     """
-        Function to handle pagination for the org list on the homepage
+        Function to handle pagination for the project list on the homepage
     """
 
-    table = db.org_organisation
-    table.id.label = T("Organization")
-    table.id.represent = organisation_represent
+    table = s3db.project_project
+    table.id.label = T("Project")
+    table.id.represent = lambda id: \
+        s3db.project_project_represent(id, show_link=False)
 
     response.s3.dataTable_sPaginationType = "two_button"
     response.s3.dataTable_sDom = "rtip" #"frtip" - filter broken
     response.s3.dataTable_iDisplayLength = 25
 
-    s3mgr.configure("org_organisation",
+    s3mgr.configure("project_project",
                     listadd = False,
                     addbtn = True,
-                    super_entity = db.pr_pentity,
-                    linkto = "/%s/org/organisation/%s" % (request.application,
-                                                          "%s"),
+                    # Link straight to Tasks view & filter to just those which are open
+                    linkto = "/%s/project/project/%s/task?open=1" % \
+                        (request.application, "%s"),
                     list_fields = ["id",])
 
-    return s3_rest_controller("org", "organisation")
+    return s3_rest_controller("project", "project")
+
 # -----------------------------------------------------------------------------
 def site():
     """
diff --git a/deployment-templates/models/000_config.py b/deployment-templates/models/000_config.py
@@ -385,7 +385,7 @@
 # Uncomment to allow Staff & Volunteers to be registered without an email address
 #deployment_settings.hrm.email_required = False
 # Uncomment to hide the Staff resource
-#deployment_settings.hrm.show_staff = False
+deployment_settings.hrm.show_staff = False
 # Uncomment to hide the Volunteer resource
 #deployment_settings.hrm.show_vols = False
 # Uncomment to allow hierarchical categories of Skills, which each need their own set of competency levels.
@@ -461,7 +461,7 @@
         )),
     # All modules below here should be possible to disable safely
     ("hrm", Storage(
-            name_nice = T("Staff & Volunteers"),
+            name_nice = T("Volunteers"),
             description = T("Human Resource Management"),
             restricted = True,
             module_type = 2,
@@ -616,12 +616,12 @@
            restricted = False,
            module_type = 10,
        )),
-    #("cms", Storage(
-    #       name_nice = T("Content Management"),
-    #       description = T("Content Management System"),
-    #       restricted = True,
-    #       module_type = 10,
-    #   )),
+    ("cms", Storage(
+           name_nice = T("Content Management"),
+           description = T("Content Management System"),
+           restricted = True,
+           module_type = 10,
+       )),
     #("fire", Storage(
     #       name_nice = T("Fire Stations"),
     #       description = T("Fire Station Management"),
diff --git a/languages/en-gb.py b/languages/en-gb.py
@@ -40,6 +40,7 @@
 'A task is a piece of work that an individual or team can do in 1-2 days': 'A task is a piece of work that an individual or team can do in 1-2 days',
 'ABOUT THIS MODULE': 'ABOUT THIS MODULE',
 'ACCESS DATA': 'ACCESS DATA',
+'ACTION REQUIRED': 'ACTION REQUIRED',
 'ANY': 'ANY',
 'API Key': 'API Key',
 'API is documented here': 'API is documented here',
diff --git a/views/default/index.html b/views/default/index.html
@@ -5,10 +5,6 @@ <h2>{{=title}}</h2>
 {{except:}}{{pass}}
 {{=XML(item)}}
 <div id='menu_box_1'>
-{{try:}}
-{{=sit_dec_res_box}}
-{{except:}}{{pass}}
-{{=facility_box}}
 {{if AUTHENTICATED not in session.s3.roles:}}
 	<div id='login_box' class='menu_box'>
 	    {{if not self_registration or registered:}}
@@ -31,8 +27,7 @@ <h2>{{=title}}</h2>
 	    {{pass}}
 	</div>
 {{pass}}
-{{=manage_facility_box}}
-{{=org_box}}
+{{=project_box}}
 </div>
 <div id='menu_box_2'>
 <!-- More boxes can go here -->
@@ -57,6 +52,6 @@ <h2>{{=title}}</h2>
     <span style="color:#676767;font-size:11px;margin:10px;padding:4px;">{{=T("Loading")}}...</span>
 </div>
 {{pass}}
-{{if org_box:}}
+{{if project_box:}}
 {{include "dataTables.html"}}
 {{pass}}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2afe5f1 (2012-03-16 13:27:39)`
	`1`	`+6e2877f (2012-03-16 13:41:59)`