liquid_feedback_frontend
diff model/issue.lua @ 75:733f65c0c0a0
Bugfixes, feature enhancements, code-cleanup, and major work on API
Details:
- API
-- Allow relation name to be passed to helper function util.autoapi{...}
-- Added area API
-- Bugfixes in API
--- Correctly return initiatives (bug #162)
--- Correctly process "id" parameter for initiative API
--- Bugfix related to "state" parameter (bug #165)
--- Changed constant "discussion" to "accepted" (in model/issue.lua, used by API)
--- Fixed JSON encoding in auto_api (bug #181)
--- Ignore list filter "voted" in case of public access
--- Enable access to API without session
- Work on RSS feed (incomplete yet)
- Other bugfixes
-- Handle empty browser identification string
-- Handle invalid date in member/update.lua (bugs #24 #109 #115 #136)
-- Better handle errors while converting uploaded images. (bug #79 +5 duplicates)
-- Don't display revoked initiatives in list of new drafts (bug #134)
-- Fixed syntax error in app/main/member/_action/update_name.lua throwing unexpected error, when new name was too short
-- Do not display refresh support button for revoked initiatives
-- Repaired issue search (bug #150)
-- Fixed typos in german translation files
--- "initi(i)erte"
--- "Er(g)eignisse" (bug #161)
- Code cleanup
-- Removed deprecated motd files locale/motd/de.txt and locale/motd/de_public.txt
-- Removed redundant code in app/main/index/_updated_drafts.lua
- New features and (optical) enhancements
-- Support change of notify email; notification of not approved address added to start page
-- Settings dialog splitted into single pages
-- Mark deactivated members
-- Calendar for birthday selection in profile
-- Policy list public readable when public access is enabled
Details:
- API
-- Allow relation name to be passed to helper function util.autoapi{...}
-- Added area API
-- Bugfixes in API
--- Correctly return initiatives (bug #162)
--- Correctly process "id" parameter for initiative API
--- Bugfix related to "state" parameter (bug #165)
--- Changed constant "discussion" to "accepted" (in model/issue.lua, used by API)
--- Fixed JSON encoding in auto_api (bug #181)
--- Ignore list filter "voted" in case of public access
--- Enable access to API without session
- Work on RSS feed (incomplete yet)
- Other bugfixes
-- Handle empty browser identification string
-- Handle invalid date in member/update.lua (bugs #24 #109 #115 #136)
-- Better handle errors while converting uploaded images. (bug #79 +5 duplicates)
-- Don't display revoked initiatives in list of new drafts (bug #134)
-- Fixed syntax error in app/main/member/_action/update_name.lua throwing unexpected error, when new name was too short
-- Do not display refresh support button for revoked initiatives
-- Repaired issue search (bug #150)
-- Fixed typos in german translation files
--- "initi(i)erte"
--- "Er(g)eignisse" (bug #161)
- Code cleanup
-- Removed deprecated motd files locale/motd/de.txt and locale/motd/de_public.txt
-- Removed redundant code in app/main/index/_updated_drafts.lua
- New features and (optical) enhancements
-- Support change of notify email; notification of not approved address added to start page
-- Settings dialog splitted into single pages
-- Mark deactivated members
-- Calendar for birthday selection in profile
-- Policy list public readable when public access is enabled
author | bsw |
---|---|
date | Thu Jul 08 18:44:02 2010 +0200 (2010-07-08) |
parents | 88ac7798b562 |
children | eb6509288d67 |
line diff
1.1 --- a/model/issue.lua Wed May 26 15:47:52 2010 +0200 1.2 +++ b/model/issue.lua Thu Jul 08 18:44:02 2010 +0200 1.3 @@ -142,23 +142,29 @@ 1.4 :add_group_by('"issue"."vote_now"') 1.5 :add_group_by('"issue"."vote_later"') 1.6 :add_group_by('"issue"."voter_count"') 1.7 + :add_group_by('"issue"."admission_time"') 1.8 + :add_group_by('"issue"."discussion_time"') 1.9 + :add_group_by('"issue"."verification_time"') 1.10 + :add_group_by('"issue"."voting_time"') 1.11 :add_group_by('"_interest"."member_id"') 1.12 --:set_distinct() 1.13 end 1.14 1.15 -function Issue:modify_selector_for_state(state) 1.16 +function Issue:modify_selector_for_state(initiatives_selector, state) 1.17 if state == "new" then 1.18 - initiatives_selector:add_where("issue.accepted ISNULL AND issue.cancelled ISNULL") 1.19 + initiatives_selector:add_where("issue.accepted ISNULL AND issue.closed ISNULL") 1.20 elseif state == "accepted" then 1.21 - initiatives_selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.cancelled ISNULL") 1.22 + initiatives_selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL") 1.23 elseif state == "frozen" then 1.24 - initiatives_selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL AND cancelled ISNULL") 1.25 + initiatives_selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL AND issue.closed ISNULL") 1.26 elseif state == "voting" then 1.27 - initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.finished ISNULL AND issue.cancelled ISNULL") 1.28 + initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL") 1.29 elseif state == "finished" then 1.30 - initiatives_selector:add_where("issue.finished NOTNULL") 1.31 + initiatives_selector:add_where("issue.fully_frozen NOTNULL AND issue.closed NOTNULL") 1.32 elseif state == "cancelled" then 1.33 - initiatives_selector:add_where("issue.cancelled NOTNULL") 1.34 + initiatives_selector:add_where("issue.fully_frozen ISNULL AND issue.closed NOTNULL") 1.35 + else 1.36 + error("Invalid state") 1.37 end 1.38 end 1.39