lfapi
changeset 27:c01cf3f82496
Checks for boolean must use === instead of ==
author | bsw |
---|---|
date | Sun Nov 06 20:22:51 2011 +0100 (2011-11-06) |
parents | 73670695f8c4 |
children | a37c91ce44d6 |
files | lfapi/general_params.js |
line diff
1.1 --- a/lfapi/general_params.js Sun Nov 06 19:57:55 2011 +0100 1.2 +++ b/lfapi/general_params.js Sun Nov 06 20:22:51 2011 +0100 1.3 @@ -26,13 +26,13 @@ 1.4 var member_search = params[relation ? relation + '_member_search' : 'member_search']; 1.5 var member_order_by_name = parseInt(params[relation ? relation + '_member_order_by_name' : 'member_order_by_name']); 1.6 var member_order_by_created = parseInt(params[relation ? relation + '_member_order_by_created' : 'member_order_by_created']); 1.7 - 1.8 + 1.9 if (member_id) { 1.10 query.addWhere(['"' + table_name + '"."id" IN (??)', member_id.split(',')]); 1.11 }; 1.12 - if (member_active == '1') { 1.13 + if (member_active === '1') { 1.14 query.addWhere('"' + table_name + '"."active" = TRUE OR "' + table_name + '"."active" ISNULL'); 1.15 - } else if (member_active == '0') { 1.16 + } else if (member_active === '0') { 1.17 query.addWhere('"' + table_name + '"."active" = FALSE'); 1.18 }; 1.19 if (member_search) { 1.20 @@ -64,7 +64,7 @@ 1.21 if (params.unit_parent_id) { 1.22 query.addWhere(['"unit"."parent_id" = ?', params.unit_parent_id]); 1.23 } 1.24 - if (params.unit_without_parent == '1') { 1.25 + if (params.unit_without_parent === '1') { 1.26 query.addWhere('"unit"."parent_id" ISNULL'); 1.27 } 1.28 if (params.unit_disabled == 'only') { 1.29 @@ -115,19 +115,19 @@ 1.30 query.addWhere(['"issue"."state" IN (??)', issue_states]); 1.31 }; 1.32 1.33 - if (params.issue_accepted == '1') query.addWhere('"issue"."accepted" NOTNULL'); 1.34 - if (params.issue_accepted == '0') query.addWhere('"issue"."accepted" ISNULL'); 1.35 - if (params.issue_half_frozen == '1') query.addWhere('"issue"."half_frozen" NOTNULL'); 1.36 - if (params.issue_half_frozen == '0') query.addWhere('"issue"."half_frozen" ISNULL'); 1.37 - if (params.issue_fully_frozen == '1') query.addWhere('"issue"."fully_frozen" NOTNULL'); 1.38 - if (params.issue_fully_frozen == '0') query.addWhere('"issue"."fully_frozen" ISNULL'); 1.39 - if (params.issue_closed == '1') query.addWhere('"issue"."closed" NOTNULL'); 1.40 - if (params.issue_closed == '0') query.addWhere('"issue"."closed" ISNULL'); 1.41 - if (params.issue_cleaned == '1') query.addWhere('"issue"."cleaned" NOTNULL'); 1.42 - if (params.issue_cleaned == '0') query.addWhere('"issue"."cleaned" ISNULL'); 1.43 + if (params.issue_accepted === '1') query.addWhere('"issue"."accepted" NOTNULL'); 1.44 + if (params.issue_accepted === '0') query.addWhere('"issue"."accepted" ISNULL'); 1.45 + if (params.issue_half_frozen === '1') query.addWhere('"issue"."half_frozen" NOTNULL'); 1.46 + if (params.issue_half_frozen === '0') query.addWhere('"issue"."half_frozen" ISNULL'); 1.47 + if (params.issue_fully_frozen === '1') query.addWhere('"issue"."fully_frozen" NOTNULL'); 1.48 + if (params.issue_fully_frozen === '0') query.addWhere('"issue"."fully_frozen" ISNULL'); 1.49 + if (params.issue_closed === '1') query.addWhere('"issue"."closed" NOTNULL'); 1.50 + if (params.issue_closed === '0') query.addWhere('"issue"."closed" ISNULL'); 1.51 + if (params.issue_cleaned === '1') query.addWhere('"issue"."cleaned" NOTNULL'); 1.52 + if (params.issue_cleaned === '0') query.addWhere('"issue"."cleaned" ISNULL'); 1.53 1.54 - if (params.issue_ranks_available == '1') query.addWhere('"issue"."ranks_available"'); 1.55 - if (params.issue_ranks_available == '0') query.addWhere('NOT "issue"."ranks_available"'); 1.56 + if (params.issue_ranks_available === '1') query.addWhere('"issue"."ranks_available"'); 1.57 + if (params.issue_ranks_available === '0') query.addWhere('NOT "issue"."ranks_available"'); 1.58 1.59 if (params.issue_created_after) query.addWhere(['"issue"."created" >= ?', params.issue_created_after]); 1.60 if (params.issue_created_before) query.addWhere(['"issue"."created" < ?', params.issue_created_before]); 1.61 @@ -165,16 +165,16 @@ 1.62 //exports.addMemberOptions(query, params, 'initiator'); 1.63 //exports.addMemberOptions(query, params, 'supporter'); 1.64 1.65 - if (params.initiative_revoked == '1') query.addWhere('initiative.revoked NOTNULL'); 1.66 - if (params.initiative_revoked == '0') query.addWhere('initiative.revoked ISNULL'); 1.67 + if (params.initiative_revoked === '1') query.addWhere('initiative.revoked NOTNULL'); 1.68 + if (params.initiative_revoked === '0') query.addWhere('initiative.revoked ISNULL'); 1.69 if (params.initiative_revoked_after) query.addWhere(['initiative.revoked >= ?', params.initiative_revoked_after]); 1.70 if (params.initiative_revoked_before) query.addWhere(['initiative.revoked < ?', params.initiative_revoked_before]); 1.71 // TODO check accesslevel 1.72 if (params.initiative_revoked_by_member_id) query.addWhere(['initiative.revoked_by_member_id = ?', params.initiative_revoked_by_member_id]); 1.73 if (params.initiative_suggested_initiative_id) query.addWhere(['initiative.suggested_initiative_id = ?', params.initiative_suggested_initiative_id]); 1.74 1.75 - if (params.initiative_admitted == '1') query.addWhere('initiative.admitted NOTNULL'); 1.76 - if (params.initiative_admitted == '0') query.addWhere('initiative.admitted ISNULL'); 1.77 + if (params.initiative_admitted === '1') query.addWhere('initiative.admitted NOTNULL'); 1.78 + if (params.initiative_admitted === '0') query.addWhere('initiative.admitted ISNULL'); 1.79 if (params.initiative_created_after) query.addWhere(['initiative.created >= ?', params.initiative_created_after]); 1.80 if (params.initiative_created_before) query.addWhere(['initiative.created < ?',params.initiative_created_before]); 1.81 if (params.initiative_admitted_after) query.addWhere(['initiative.admitted >= ?', params.initiative_admitted_after]); 1.82 @@ -183,20 +183,20 @@ 1.83 if (params.initiative_supporter_count_below) query.addWhere(['initiative.supporter_count < ?', params.initiative_supporter_count_below]); 1.84 if (params.initiative_supporter_count_above) query.addWhere(['initiative.supporter_count >= ?', params.initiative_supporter_count_above]); 1.85 1.86 - if (params.initiative_attainable == '1') query.addWhere('initiative.attainable'); 1.87 - if (params.initiative_attainable == '0') query.addWhere('NOT initiative.attainable'); 1.88 - if (params.initiative_favored == '1') query.addWhere('initiative.favored'); 1.89 - if (params.initiative_favored == '0') query.addWhere('NOT initiative.favored'); 1.90 - if (params.initiative_unfavored == '1') query.addWhere('initiative.unfavored'); 1.91 - if (params.initiative_unfavored == '0') query.addWhere('NOT initiative.unfavored'); 1.92 + if (params.initiative_attainable === '1') query.addWhere('initiative.attainable'); 1.93 + if (params.initiative_attainable === '0') query.addWhere('NOT initiative.attainable'); 1.94 + if (params.initiative_favored === '1') query.addWhere('initiative.favored'); 1.95 + if (params.initiative_favored === '0') query.addWhere('NOT initiative.favored'); 1.96 + if (params.initiative_unfavored === '1') query.addWhere('initiative.unfavored'); 1.97 + if (params.initiative_unfavored === '0') query.addWhere('NOT initiative.unfavored'); 1.98 1.99 if (params.initiative_max_preliminary_rank) query.addWhere(['initiative.preliminary_rank <= ?', params.initiative_max_preliminary_rank]); 1.100 if (params.initiative_max_final_rank) query.addWhere(['initiative.preliminary_rank <= ?', params.initiative_max_final_rank]); 1.101 1.102 - if (params.initiative_disqualified == '1') query.addWhere('initiative.disqualified'); 1.103 - if (params.initiative_disqualified == '0') query.addWhere('NOT initiative.disqualified'); 1.104 - if (params.initiative_winner == '1') query.addWhere('initiative.winner'); 1.105 - if (params.initiative_winner == '0') query.addWhere('NOT initiative.winner'); 1.106 + if (params.initiative_disqualified === '1') query.addWhere('initiative.disqualified'); 1.107 + if (params.initiative_disqualified === '0') query.addWhere('NOT initiative.disqualified'); 1.108 + if (params.initiative_winner === '1') query.addWhere('initiative.winner'); 1.109 + if (params.initiative_winner === '0') query.addWhere('NOT initiative.winner'); 1.110 1.111 if (params.initiative_search) { 1.112 query.addWhere(['initiative.text_search_data @@ text_search_query(?)', params.initiative_search]);