Merge lp:~keitheis/sahana-eden/edentrunk into lp:sahana-eden

[Keith Yang]

Patch to reuse last input record as template to create new incident report

[lp:~keitheis/sahana-eden/edentrunk]

1055. By Fran Boon on 2010-08-22

per-merge commit: collapse-mode mini from sonicx

1056. By Fran Boon on 2010-08-22

Merge nursix: Notifications persist through redirection

1057. By Fran Boon on 2010-08-22

Merge nursix: Don't redirect after create from popups

[Fran Boon (flavour)]

I'm not sure that I like this as the default behaviour...how often would someone be reporting multiple incidents with several details in common?
We should default the Reporter Name & Date/Time fields on Create records anyway.
(The Reporter Name is defaulted, but the AutoComplete renders this invisible, which I'll fix.

This was the original Ticket, which prompted this feature:
http://eden.sahanafoundation.org/ticket/506

I think I'd prefer to see this feature as an action button, so that the Incidents list is visible & user has option to 'Copy' an Incident which makes a new one.
This could then be used in other modules too.

review: Needs Fixing

[lp:~keitheis/sahana-eden/edentrunk]

1058. By Fran Boon on 2010-08-22

Fix defaults showing in AutoCompletes

1059. By Fran Boon on 2010-08-22

Usability enhancements for RMS (suggestions from Hsiaojan) & AutoCompletes/Default

1060. By Fran Boon on 2010-08-22

Merge nursix: extend from_record to support templating to alternate resources

1061. By Fran Boon on 2010-08-22

Remove print statement

1062. By Fran Boon on 2010-08-22

Handle commas in KML Layer Names
Improve Lat/Lon help text in Add Location
Tooltip opacity increased & don't display them if we have no attributes for them
Provide model changes to KML layers to support flexible popups

1063. By Fran Boon on 2010-08-22

Merge nursix: Form subheaders

[Michael Howden (michael-howden)]

See discussion at:
http://groups.google.com/group/sahana-eden/browse_thread/thread/509221ab628c85eb

[lp:~keitheis/sahana-eden/edentrunk]

1064. By Fran Boon on 2010-08-22

Move locations hierarchy to deployment_settings
Enhanced KML overlay support

1065. By Fran Boon on 2010-08-22

Merge keitheis: Copy function added to shn_action_buttons in IRS
Added the same to KML layers, more KML tweaks

1066. By Fran Boon on 2010-08-22

per-merge commit: Protect the default Map settings, whilst still allowing personalisable settings. Start preparing for GeoServer/GeoSpatial DB integration (Healthscapes merge)

1067. By Fran Boon on 2010-08-22

merge nursix: RAT section 3

1068. By Fran Boon on 2010-08-22

Correct Locations security

1069. By Fran Boon on 2010-08-23

Locations now have a Simple Search form

1070. By Fran Boon on 2010-08-23

Location AutoComplete progress (not complete, so not being pulled to live yet)
Moved Ext JS/CSS to load for all pages (gray theme live throughout)

1071. By Fran Boon on 2010-08-24

More work on Locations Selector - can now add new records, still much to be done though

1072. By Fran Boon on 2010-08-24

Merge michael: many tweaks :)

1073. By Keith Yang on 2010-08-24

Try the way of redifined minimal incident categories

Unmerged revisions

1073. By Keith Yang on 2010-08-24

Try the way of redifined minimal incident categories

=== modified file 'controllers/irs.py'
--- controllers/irs.py	2010-08-22 10:49:45 +0000
+++ controllers/irs.py	2010-08-22 18:11:00 +0000
@@ -139,7 +139,7 @@
 
     # Post-processor
     def user_postp(jr, output):
-        shn_action_buttons(jr, deletable=False)
+        shn_action_buttons(jr, deletable=False, copyable=True)
         return output
     response.s3.postp = user_postp
 

=== modified file 'models/00_settings.py'
--- models/00_settings.py	2010-08-20 13:35:28 +0000
+++ models/00_settings.py	2010-08-22 18:11:00 +0000
@@ -14,6 +14,7 @@
 #UPDATE = T("Edit")
 #UPDATE = T("Update")
 DELETE = T("Delete")
+COPY = T("Copy")
 
 # Default strings are in US English
 T.current_languages = ["en", "en-us"]

=== modified file 'models/00_utils.py'
--- models/00_utils.py	2010-08-22 13:48:34 +0000
+++ models/00_utils.py	2010-08-22 18:11:00 +0000
@@ -393,7 +393,7 @@
     else:
         return word
 
-def shn_action_buttons(jr, deletable=True):
+def shn_action_buttons(jr, deletable=True, copyable=False):
 
     """
         Provide the usual Action Buttons for Column views.
@@ -407,15 +407,17 @@
 
     if shn_has_permission("update", jr.table):
         # Provide the ability to delete records in bulk
+        response.s3.actions = [
+            dict(label=str(UPDATE), _class="action-btn", url=str(URL(r=request, args = args + ["update"]))),
+        ]
         if deletable and shn_has_permission("delete", jr.table):
-            response.s3.actions = [
-                dict(label=str(UPDATE), _class="action-btn", url=str(URL(r=request, args = args + ["update"]))),
+            response.s3.actions.append(
                 dict(label=str(DELETE), _class="action-btn", url=str(URL(r=request, args = args + ["delete"])))
-            ]
-        else:
-            response.s3.actions = [
-                dict(label=str(UPDATE), _class="action-btn", url=str(URL(r=request, args = args + ["update"])))
-            ]
+            )
+        if copyable:
+            response.s3.actions.append(
+                dict(label=str(COPY), _class="action-btn", url=str(URL(r=request, args = args + ["copy"])))
+            )
     else:
         response.s3.actions = [
             dict(label=str(READ), _class="action-btn", url=str(URL(r=request, args = args)))

=== modified file 'models/01_crud.py'
--- models/01_crud.py	2010-08-22 14:18:24 +0000
+++ models/01_crud.py	2010-08-22 18:11:00 +0000
@@ -1799,6 +1799,12 @@
     return output
 
 #
+# shn_copy ------------------------------------------------------------------
+#
+def shn_copy(r, **attr):
+    redirect(URL(r=request, args="create", vars={"from_record":r.id}))
+
+#
 # shn_search ------------------------------------------------------------------
 #
 def shn_search(r, **attr):
@@ -2030,6 +2036,7 @@
     s3xrc.set_handler("update", shn_update)
     s3xrc.set_handler("delete", shn_delete)
     s3xrc.set_handler("search", shn_search)
+    s3xrc.set_handler("copy", shn_copy)
 
     res, req = s3xrc.parse_request(module, resource, session, request, response)
     output = res.execute_request(req, **attr)

=== modified file 'modules/s3xrc.py'
--- modules/s3xrc.py	2010-08-22 10:04:24 +0000
+++ modules/s3xrc.py	2010-08-22 18:11:00 +0000
@@ -963,6 +963,9 @@
                r.representation in json_import_formats:
                 method = "import_tree"
 
+        elif method == "copy":
+            authorised = permit("create", tablename)
+
         elif method == "delete":
             return self.__delete(r)