Merge lp://staging/~robbyoconnor/sahana-eden/trunk into lp://staging/sahana-eden

Proposed by Robert O'Connor
Status: Needs review
Proposed branch: lp://staging/~robbyoconnor/sahana-eden/trunk
Merge into: lp://staging/sahana-eden
Diff against target: 0 lines
To merge this branch: bzr merge lp://staging/~robbyoconnor/sahana-eden/trunk
Reviewer Review Type Date Requested Status
Fran Boon Needs Fixing
Review via email: mp+45312@code.staging.launchpad.net

Description of the change

fix #881 by megaterik

To post a comment you must log in.
Revision history for this message
Fran Boon (flavour) wrote :

This is a retrograde step.
IS_IN_DB() does not support deletion_status which IS_ONE_OF() extends it to do:
http://eden.sahanafoundation.org/wiki/IS_ONE_OF

shelter_service does have the deletion_status field, so needs this setting.

review: Needs Fixing
1628. By Robert O'Connor

merge with trunk

1629. By Robert O'Connor

merge with trunk

Unmerged revisions

1629. By Robert O'Connor

merge with trunk

1628. By Robert O'Connor

merge with trunk

1627. By Robert O'Connor

merge with trunk

1626. By Robert O'Connor

fix #881 by megaterik

1625. By Robert O'Connor

merge with trunk

1624. By Robert O'Connor

merge w/ trunk

1623. By Robert O'Connor

merge with trunk

1622. By Robert O'Connor

merge with trunk

1621. By Robert O'Connor

merge with trunk

1620. By Robert O'Connor

merge with trunk

Preview Diff

Empty