diff --git a/lib/sf/account.rb b/lib/sf/account.rb index 2c5f4ab..e8b14b5 100644 --- a/lib/sf/account.rb +++ b/lib/sf/account.rb @@ -1,7 +1,7 @@ class Sf::Account include Sf::Base - FIELDS = ['Id', 'Name', 'Member_Type__c', 'Member_Category__c', 'Member_Join_Date__c', 'Status__c', 'Website', 'InCommon_Participant__c', 'iMIS_ID__c', 'Membership_Status__c'] + FIELDS = ['Id', 'Name', 'Member_Type__c', 'Member_Category__c', 'MOU_Participant__c', 'Member_Join_Date__c', 'Status__c', 'Website', 'InCommon_Participant__c', 'iMIS_ID__c', 'Membership_Status__c'] FIELDS_SELECT_STR = FIELDS.join(', ') MEMBER_TYPES = ['R&E Network Member', 'University Member', 'Industry Member', 'Affiliate Member'] MEMBER_TYPES_STR = MEMBER_TYPES.map{|v| "\'#{v}\'"}.join(', ') @@ -45,11 +45,11 @@ def self.find_by(args = {}) end def self.intl_partners - build_collection Sf.client.query("select #{FIELDS_SELECT_STR} from Account where Member_Category__c = 'International Partner' order by Name") + build_collection Sf.client.query("select #{FIELDS_SELECT_STR} from Account where MOU_Participant__c = true order by Name") end def self.members - build_collection Sf.client.query("select #{FIELDS_SELECT_STR} from Account where Membership_Status__c = true and Status__c = 'Active' order by Name") + build_collection Sf.client.query("select #{FIELDS_SELECT_STR} from Account where Membership_Status__c = true order by Name") end def self.all @@ -60,8 +60,8 @@ def self.community_orgs build_collection Sf.client.query( "select #{FIELDS_SELECT_STR} from Account where Name='Internet2' or InCommon_Participant__c = true - or (Membership_Status__c = true and Status__c = 'Active') - or Member_Category__c = 'International Partner' + or Membership_Status__c = true + or MOU_Participant__c = true order by Name" ) end diff --git a/lib/sf/version.rb b/lib/sf/version.rb index ff5761b..5fcf0b2 100644 --- a/lib/sf/version.rb +++ b/lib/sf/version.rb @@ -1,3 +1,3 @@ module Sf - VERSION = "0.1.27" + VERSION = "0.1.28" end