lp:~sahana-eden-vms/sahana-eden/vms

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:sahana-eden at revision 993

Fran Boon: Pending requested 2010-08-17

Diff: 816 lines (+329/-321)

9 files modified

controllers/msg.py (+2/-54)
controllers/vol.py (+96/-10)
models/msg.py (+66/-0)
models/vol.py (+24/-132)
views/msg/_compose.html (+133/-0)
views/msg/compose.html (+2/-125)
views/vol/compose_group.html (+2/-0)
views/vol/compose_person.html (+2/-0)
views/vol/view_team_map.html (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

792. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-17

Merge from trunk. Temporarily omit Dominic's changes to models/vol.py as they go with changes in controllers/vol.py that are not present. These will be recovered and merged later.

791. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-17

Change single quotes to double, minor formatting.

790. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-16

For no good reason except tradition, add a reusable field for the skill types table. Tweak some labels.

Merged branch lp:~ptressel/sahana-eden/short

789. By zubair assad on 2010-08-16

Skills

Merged branch lp:~zubairassad89/sahana-eden/vms_gsoc

788. By zubair assad on 2010-08-15

messaging

Merged branch lp:~zubairassad89/sahana-eden/vms_gsoc

787. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-15

Merge from trunk, except for models/vol.py.

786. By zubair assad on 2010-08-11

Mapping Members of a Team aka Group

Merged branch lp:~zubairassad89/sahana-eden/vms_gsoc

785. By Patricia Tressel <Patricia Tressel@phobos> on 2010-08-05

Fix view_map queries: AND -> &. Remove useless _nexts.

784. By Patricia Tressel <Patricia Tressel@phobos> on 2010-07-30

Merge from trunk.
Two conflicts resolved with change to trunk:
00_utils.py shn_rheader_tabs:
  Don't put _next into jr.request.vars where some downstream use might find it.
01_crud.py shn_read:
  Put vars in delete, edit, and redirect urls.

783. By Patricia Tressel <Patricia Tressel@phobos> on 2010-07-30

Switch prefixes back to vol for person component tables defined in vol.
As per Dominic, jr.request.vars is a Storage, not a dict.
If user passes _next into shn_rheader_tabs, keep it.
Don't nest _next.
Remove extra _next.
Don't use a dot in a vars key.