lib/osm/evening.rb in osm-0.1.3 vs lib/osm/evening.rb in osm-0.1.4

- old
+ new

@@ -66,11 +66,11 @@ def self.get_programme(api, section, term, options={}) section_id = section.to_i term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, section).id : term.to_i cache_key = ['programme', section_id, term_id] - if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permissions(api, section_id)[:programme].include?(:read) + if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section_id, :programme).include?(:read) return cache_read(api, cache_key) end data = api.perform_query("programme.php?action=getProgramme&sectionid=#{section_id}&termid=#{term_id}") @@ -184,10 +184,10 @@ # @return [Array<Hash>] hashes ready to pass into the update_register method def get_badge_requirements(api, options={}) section = Osm::Section.get(api, section_id) cache_key = ['badge_requirements', section.id, id] - if !options[:no_cache] && self.class.cache_exist?(api, cache_key) && get_user_permissions(api, section_id)[:programme].include?(:read) + if !options[:no_cache] && self.class.cache_exist?(api, cache_key) && get_user_permission(api, section_id, :programme).include?(:read) return self.class.cache_read(api, cache_key) end data = api.perform_query("users.php?action=getActivityRequirements&date=#{meeting_date.strftime(Osm::OSM_DATE_FORMAT)}&sectionid=#{section.id}&section=#{section.type}")