# HG changeset patch # User jbe # Date 1306977501 -7200 # Node ID 652be62683cb8d5027746a597bc15f8657e8c354 # Parent 0fa3c4739ca75a0dd55c073903e274ec20fce137 Backported bugfixes in functions "close_voting" and "clean_issue" to v1.4.0_rcX - In "close_voting": Only add autoreject votes for admitted issues - In "clean_issue": Temporarily update "issue"."state" to avoid constraint violation diff -r 0fa3c4739ca7 -r 652be62683cb core.sql --- a/core.sql Thu Jun 02 01:22:41 2011 +0200 +++ b/core.sql Thu Jun 02 03:18:21 2011 +0200 @@ -7,7 +7,7 @@ BEGIN; CREATE VIEW "liquid_feedback_version" AS - SELECT * FROM (VALUES ('1.4.0_rc2', 1, 4, -1)) + SELECT * FROM (VALUES ('1.4.0_rc4', 1, 4, -1)) AS "subquery"("string", "major", "minor", "revision"); @@ -3489,7 +3489,8 @@ "issue_id_p" AS "issue_id", "id" AS "initiative_id", -1 AS "grade" - FROM "initiative" WHERE "issue_id" = "issue_id_p"; + FROM "initiative" + WHERE "issue_id" = "issue_id_p" AND "admitted"; END LOOP; PERFORM "add_vote_delegations"("issue_id_p"); UPDATE "issue" SET @@ -4019,7 +4020,8 @@ FOR UPDATE; IF "issue_row"."cleaned" ISNULL THEN UPDATE "issue" SET - "closed" = NULL, + "state" = 'voting', + "closed" = NULL, "ranks_available" = FALSE WHERE "id" = "issue_id_p"; DELETE FROM "delegating_voter" @@ -4041,6 +4043,7 @@ DELETE FROM "supporter" WHERE "issue_id" = "issue_id_p"; UPDATE "issue" SET + "state" = "issue_row"."state", "closed" = "issue_row"."closed", "ranks_available" = "issue_row"."ranks_available", "cleaned" = now()