# HG changeset patch # User bsw # Date 1320607371 -3600 # Node ID c01cf3f82496c88c18d36018266ca3e3995c39c9 # Parent 73670695f8c45d5f458ca183f8d708c4ac465e80 Checks for boolean must use === instead of == diff -r 73670695f8c4 -r c01cf3f82496 lfapi/general_params.js --- a/lfapi/general_params.js Sun Nov 06 19:57:55 2011 +0100 +++ b/lfapi/general_params.js Sun Nov 06 20:22:51 2011 +0100 @@ -26,13 +26,13 @@ var member_search = params[relation ? relation + '_member_search' : 'member_search']; var member_order_by_name = parseInt(params[relation ? relation + '_member_order_by_name' : 'member_order_by_name']); var member_order_by_created = parseInt(params[relation ? relation + '_member_order_by_created' : 'member_order_by_created']); - + if (member_id) { query.addWhere(['"' + table_name + '"."id" IN (??)', member_id.split(',')]); }; - if (member_active == '1') { + if (member_active === '1') { query.addWhere('"' + table_name + '"."active" = TRUE OR "' + table_name + '"."active" ISNULL'); - } else if (member_active == '0') { + } else if (member_active === '0') { query.addWhere('"' + table_name + '"."active" = FALSE'); }; if (member_search) { @@ -64,7 +64,7 @@ if (params.unit_parent_id) { query.addWhere(['"unit"."parent_id" = ?', params.unit_parent_id]); } - if (params.unit_without_parent == '1') { + if (params.unit_without_parent === '1') { query.addWhere('"unit"."parent_id" ISNULL'); } if (params.unit_disabled == 'only') { @@ -115,19 +115,19 @@ query.addWhere(['"issue"."state" IN (??)', issue_states]); }; - if (params.issue_accepted == '1') query.addWhere('"issue"."accepted" NOTNULL'); - if (params.issue_accepted == '0') query.addWhere('"issue"."accepted" ISNULL'); - if (params.issue_half_frozen == '1') query.addWhere('"issue"."half_frozen" NOTNULL'); - if (params.issue_half_frozen == '0') query.addWhere('"issue"."half_frozen" ISNULL'); - if (params.issue_fully_frozen == '1') query.addWhere('"issue"."fully_frozen" NOTNULL'); - if (params.issue_fully_frozen == '0') query.addWhere('"issue"."fully_frozen" ISNULL'); - if (params.issue_closed == '1') query.addWhere('"issue"."closed" NOTNULL'); - if (params.issue_closed == '0') query.addWhere('"issue"."closed" ISNULL'); - if (params.issue_cleaned == '1') query.addWhere('"issue"."cleaned" NOTNULL'); - if (params.issue_cleaned == '0') query.addWhere('"issue"."cleaned" ISNULL'); + if (params.issue_accepted === '1') query.addWhere('"issue"."accepted" NOTNULL'); + if (params.issue_accepted === '0') query.addWhere('"issue"."accepted" ISNULL'); + if (params.issue_half_frozen === '1') query.addWhere('"issue"."half_frozen" NOTNULL'); + if (params.issue_half_frozen === '0') query.addWhere('"issue"."half_frozen" ISNULL'); + if (params.issue_fully_frozen === '1') query.addWhere('"issue"."fully_frozen" NOTNULL'); + if (params.issue_fully_frozen === '0') query.addWhere('"issue"."fully_frozen" ISNULL'); + if (params.issue_closed === '1') query.addWhere('"issue"."closed" NOTNULL'); + if (params.issue_closed === '0') query.addWhere('"issue"."closed" ISNULL'); + if (params.issue_cleaned === '1') query.addWhere('"issue"."cleaned" NOTNULL'); + if (params.issue_cleaned === '0') query.addWhere('"issue"."cleaned" ISNULL'); - if (params.issue_ranks_available == '1') query.addWhere('"issue"."ranks_available"'); - if (params.issue_ranks_available == '0') query.addWhere('NOT "issue"."ranks_available"'); + if (params.issue_ranks_available === '1') query.addWhere('"issue"."ranks_available"'); + if (params.issue_ranks_available === '0') query.addWhere('NOT "issue"."ranks_available"'); if (params.issue_created_after) query.addWhere(['"issue"."created" >= ?', params.issue_created_after]); if (params.issue_created_before) query.addWhere(['"issue"."created" < ?', params.issue_created_before]); @@ -165,16 +165,16 @@ //exports.addMemberOptions(query, params, 'initiator'); //exports.addMemberOptions(query, params, 'supporter'); - if (params.initiative_revoked == '1') query.addWhere('initiative.revoked NOTNULL'); - if (params.initiative_revoked == '0') query.addWhere('initiative.revoked ISNULL'); + if (params.initiative_revoked === '1') query.addWhere('initiative.revoked NOTNULL'); + if (params.initiative_revoked === '0') query.addWhere('initiative.revoked ISNULL'); if (params.initiative_revoked_after) query.addWhere(['initiative.revoked >= ?', params.initiative_revoked_after]); if (params.initiative_revoked_before) query.addWhere(['initiative.revoked < ?', params.initiative_revoked_before]); // TODO check accesslevel if (params.initiative_revoked_by_member_id) query.addWhere(['initiative.revoked_by_member_id = ?', params.initiative_revoked_by_member_id]); if (params.initiative_suggested_initiative_id) query.addWhere(['initiative.suggested_initiative_id = ?', params.initiative_suggested_initiative_id]); - if (params.initiative_admitted == '1') query.addWhere('initiative.admitted NOTNULL'); - if (params.initiative_admitted == '0') query.addWhere('initiative.admitted ISNULL'); + if (params.initiative_admitted === '1') query.addWhere('initiative.admitted NOTNULL'); + if (params.initiative_admitted === '0') query.addWhere('initiative.admitted ISNULL'); if (params.initiative_created_after) query.addWhere(['initiative.created >= ?', params.initiative_created_after]); if (params.initiative_created_before) query.addWhere(['initiative.created < ?',params.initiative_created_before]); if (params.initiative_admitted_after) query.addWhere(['initiative.admitted >= ?', params.initiative_admitted_after]); @@ -183,20 +183,20 @@ if (params.initiative_supporter_count_below) query.addWhere(['initiative.supporter_count < ?', params.initiative_supporter_count_below]); if (params.initiative_supporter_count_above) query.addWhere(['initiative.supporter_count >= ?', params.initiative_supporter_count_above]); - if (params.initiative_attainable == '1') query.addWhere('initiative.attainable'); - if (params.initiative_attainable == '0') query.addWhere('NOT initiative.attainable'); - if (params.initiative_favored == '1') query.addWhere('initiative.favored'); - if (params.initiative_favored == '0') query.addWhere('NOT initiative.favored'); - if (params.initiative_unfavored == '1') query.addWhere('initiative.unfavored'); - if (params.initiative_unfavored == '0') query.addWhere('NOT initiative.unfavored'); + if (params.initiative_attainable === '1') query.addWhere('initiative.attainable'); + if (params.initiative_attainable === '0') query.addWhere('NOT initiative.attainable'); + if (params.initiative_favored === '1') query.addWhere('initiative.favored'); + if (params.initiative_favored === '0') query.addWhere('NOT initiative.favored'); + if (params.initiative_unfavored === '1') query.addWhere('initiative.unfavored'); + if (params.initiative_unfavored === '0') query.addWhere('NOT initiative.unfavored'); if (params.initiative_max_preliminary_rank) query.addWhere(['initiative.preliminary_rank <= ?', params.initiative_max_preliminary_rank]); if (params.initiative_max_final_rank) query.addWhere(['initiative.preliminary_rank <= ?', params.initiative_max_final_rank]); - if (params.initiative_disqualified == '1') query.addWhere('initiative.disqualified'); - if (params.initiative_disqualified == '0') query.addWhere('NOT initiative.disqualified'); - if (params.initiative_winner == '1') query.addWhere('initiative.winner'); - if (params.initiative_winner == '0') query.addWhere('NOT initiative.winner'); + if (params.initiative_disqualified === '1') query.addWhere('initiative.disqualified'); + if (params.initiative_disqualified === '0') query.addWhere('NOT initiative.disqualified'); + if (params.initiative_winner === '1') query.addWhere('initiative.winner'); + if (params.initiative_winner === '0') query.addWhere('NOT initiative.winner'); if (params.initiative_search) { query.addWhere(['initiative.text_search_data @@ text_search_query(?)', params.initiative_search]);