1.1 --- a/update/core-update.v2.2.5-v2.2.6.sql	Mon Oct 14 00:58:38 2013 +0200
     1.2 +++ b/update/core-update.v2.2.5-v2.2.6.sql	Mon Oct 14 19:36:33 2013 +0200
     1.3 @@ -4,24 +4,26 @@
     1.4    SELECT * FROM (VALUES ('2.2.6', 2, 2, 6))
     1.5    AS "subquery"("string", "major", "minor", "revision");
     1.6  
     1.7 -CREATE TABLE "issue_order" (
     1.8 +CREATE TABLE "issue_order_in_admission_state" (
     1.9          "id"                    INT8            PRIMARY KEY, --REFERENCES "issue" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
    1.10 -        "order_in_admission_state" INT4,
    1.11 -        "max_supporter_count"   INT4 );
    1.12 +        "order_in_area"         INT4,
    1.13 +        "order_in_unit"         INT4 );
    1.14  
    1.15 -COMMENT ON TABLE "issue_order" IS 'Ordering information for issues that are not stored in the "issue" table to avoid locking of multiple issues at once';
    1.16 +COMMENT ON TABLE "issue_order_in_admission_state" IS 'Ordering information for issues that are not stored in the "issue" table to avoid locking of multiple issues at once; Filled/updated by "lf_update_issue_order"';
    1.17  
    1.18 -COMMENT ON COLUMN "issue_order"."id"                       IS 'References "issue" ("id") but has no referential integrity trigger associated, due to performance/locking issues';
    1.19 -COMMENT ON COLUMN "issue_order"."order_in_admission_state" IS 'To be used for sorting issues within an area, when showing issues in admission state; NULL values sort last; updated by "lf_update_issue_order"';
    1.20 -COMMENT ON COLUMN "issue_order"."max_supporter_count"      IS 'Secondary sorting key when displaying issues in admission state from different areas';
    1.21 +COMMENT ON COLUMN "issue_order_in_admission_state"."id"            IS 'References "issue" ("id") but has no referential integrity trigger associated, due to performance/locking issues';
    1.22 +COMMENT ON COLUMN "issue_order_in_admission_state"."order_in_area" IS 'Order of issues in admission state within a single area; NULL values sort last';
    1.23 +COMMENT ON COLUMN "issue_order_in_admission_state"."order_in_unit" IS 'Order of issues in admission state within all areas of a unit; NULL values sort last';
    1.24  
    1.25  CREATE VIEW "issue_supporter_in_admission_state" AS
    1.26    SELECT DISTINCT
    1.27 +    "area"."unit_id",
    1.28      "issue"."area_id",
    1.29      "issue"."id" AS "issue_id",
    1.30      "supporter"."member_id",
    1.31      "direct_interest_snapshot"."weight"
    1.32    FROM "issue"
    1.33 +  JOIN "area" ON "area"."id" = "issue"."area_id"
    1.34    JOIN "supporter" ON "supporter"."issue_id" = "issue"."id"
    1.35    JOIN "direct_interest_snapshot"
    1.36      ON  "direct_interest_snapshot"."issue_id" = "issue"."id"