lp:~zubairassad89/sahana-eden/vms_gsoc

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~sahana-eden-vms/sahana-eden/vms at revision 789

Pat Tressel: Approve on 2010-08-16

Diff: 97 lines (+7/-48)

1 file modified

models/vol.py (+7/-48)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

789. By zubair assad on 2010-08-16

Skills

788. By zubair assad on 2010-08-15

messaging

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

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.

782. By zubair assad on 2010-07-28

multiselect widget files changes

781. By Patricia Tressel <Patricia Tressel@phobos> on 2010-07-27

Allow passing info via URL vars:
  Preserve vars across rheader tabs and shn_read.
  (There are more places where vars will need to be propagated.)
Fix vol tabs:
  Convert volunteer-specific pr component tables to pr_<name> and join by pe_id.
  Use same controller for generic person tabs and volunteer tabs and pass
  desired tab set in vars.
Remove obsolete message table comments from vol.
Minor style cleanup in vol.

780. By Patricia Tressel <Patricia Tressel@phobos> on 2010-07-27

Merge with minimal changes to resolve conflicts.