# HG changeset patch # User bsw # Date 1320605673 -3600 # Node ID c264e566a2d2c3bf3b350eb58569f3bbee53b809 # Parent fef5d8aad4aaf22a4dfe3813051fddb6997f160c Changed member_disabled to member_active diff -r fef5d8aad4aa -r c264e566a2d2 lfapi/general_params.js --- a/lfapi/general_params.js Sun Nov 06 19:46:27 2011 +0100 +++ b/lfapi/general_params.js Sun Nov 06 19:54:33 2011 +0100 @@ -30,10 +30,10 @@ if (member_id) { query.addWhere(['"' + table_name + '"."id" IN (??)', member_id.split(',')]); }; - if (member_disabled == 'only') { + if (member_active == '1') { + query.addWhere('"' + table_name + '"."active" = TRUE OR "' + table_name + '"."active" ISNULL'); + } else if (member_active == '0') { query.addWhere('"' + table_name + '"."active" = FALSE'); - } else if (member_disabled != 'include') { - query.addWhere('"' + table_name + '"."active" = TRUE OR "' + table_name + '"."active" ISNULL'); }; if (member_search) { query.addWhere(['"' + table_name + '"."text_search_data" @@ text_search_query(?)', member_search]);