@@ -339,7 +339,7 @@ class ApplicationController < ActionController::Base end def get_person_campus_groups - groups = Group.find :all, :conditions => {:ministry_id => @ministry.id} + groups = Group.find :all, :conditions => {:ministry_id => @ministry.id}, :include => [:group_type, :group_involvements, :campus] my_campuses_ids = @my.active_campuses.collect &:id @person_campus_groups = groups.select { |g| g.campus.nil? || my_campuses_ids.include?(g.campus.id) } end app/controllers/application_controller.rb @@ -9,7 +9,7 @@ class GroupsController < ApplicationController def index @join = false if params[:all] == 'true' - @groups = @person_campus_groups = @ministry.groups + @groups = @person_campus_groups = @ministry.groups.find(:all, :include => [:group_type, :group_involvements, :campus]) else get_person_campus_groups @groups = @person_campus_groups app/controllers/groups_controller.rb @@ -15,7 +15,7 @@ class PeopleController < ApplicationController append_before_filter :can_edit_profile, :only => [:edit, :update] append_before_filter :set_use_address2 skip_before_filter :authorization_filter, :only => [:set_current_address_states, :set_permanent_address_states, - :get_campus_states, :get_campuses] + :get_campus_states] # AUTHORIZE_FOR_OWNER_ACTIONS = [:edit, :update, :show, :import_gcx_profile, :getcampuses, # :get_campus_states, :set_current_address_states, @@ -46,7 +46,6 @@ class PeopleController < ApplicationController def directory get_view - get_campuses first_name_col = "Person.#{_(:first_name, :person)}" last_name_col = "Person.#{_(:last_name, :person)}" email = _(:email, :address) @@ -98,47 +97,6 @@ class PeopleController < ApplicationController @advanced = true end - # Check ministry - if params[:ministry].present? - # Only consider ministry ids that this person is involved in (stop deviousness) - params[:ministry] = params[:ministry].collect(&:to_i) & @my.ministry_involvements.collect(&:ministry_id) - unless params[:ministry].empty? - cond = "MinistryInvolvement.#{_(:ministry_id, :ministry_involvement)} IN(#{quote_string(params[:ministry].join(','))})" - if params[:campus].present? - conditions << cond - else - conditions << ('(' + cond + ' OR ' + campus_condition + ')') - end - @tables[MinistryInvolvement] = "#{Person.table_name}.#{_(:id, :person)} = MinistryInvolvement.#{_(:person_id, :ministry_involvement)}" - @search_for << Ministry.find(:all, :conditions => "id in(#{quote_string(params[:ministry].join(','))})").collect(&:name).join(', ') - @advanced = true - end - end - - # Check campus - if params[:campus].present? - # Only consider ministry ids that this person is involved in (stop deviousness) - params[:campus] = params[:campus].collect(&:to_i) & @campuses.collect(&:id) - @advanced = true - @search_for << Campus.find(:all, :conditions => "#{_(:id, :campus)} in (#{quote_string(params[:campus].join(','))})").collect(&:name).join(', ') if !params[:campus].empty? - else - # If no campuses were passed in, include all the campuses from the current ministry - params[:campus] = current_ministry.campuses.collect(&:id) - end - - if params[:campus].empty? - mi = get_ministry_involvement(current_ministry) - if mi && mi.ministry_role.class == StudentRole - #return # they're a student who has either hacked in params[:campus] or they have no campus_involvements. Bad Student. - redirect_to :controller => 'dashboard', :action => 'index' - return - end - else - conditions << "CampusInvolvement.#{_(:campus_id, :campus_involvement)} IN(#{quote_string(params[:campus].join(','))}) AND CampusInvolvement.#{_(:end_date, :campus_involvement)} is NULL" - @tables[CampusInvolvement] = "#{Person.table_name}.#{_(:id, :person)} = CampusInvolvement.#{_(:person_id, :campus_involvement)}" - end - - if params[:first_name].present? conditions << "Person.#{_(:first_name, :person)} LIKE '#{quote_string(params[:first_name])}%'" @search_for << "First Name: #{params[:first_name]}" @@ -157,14 +115,11 @@ class PeopleController < ApplicationController @advanced = true end - - conditions = add_involvement_conditions(conditions) if params[:ministry].blank? && params[:campus].blank? + add_involvement_conditions(conditions) @options = params.dup.delete_if {|key, value| ['action','controller','commit','search'].include?(key)} - @conditions = conditions.join(' AND ') - @search_for = @search_for.empty? ? (params[:search] || 'Everyone') : @search_for.join("; ") end @@ -232,6 +187,60 @@ class PeopleController < ApplicationController format.html { render :layout => 'application' } end end + + # Executes a search according to provided criteria. + # Guesses if the entry includes a first and last name, splits them out for the search + # TODO: Check it can handle two word lastnames like mine "Andrew de Jonge" + + def search + # figure out if the search parameter looks like a first or last name only, or both + @search = params[:search] + if @search && !@search.empty? + names = @search.strip.split(' ') + conditions = [[],[]] + if (names.size > 1) + first = names[0].to_s + last = names[1].to_s + conditions[0] << "#{_(:last_name, :person)} LIKE ? AND #{_(:first_name, :person)} LIKE ? " + conditions[1] << last + "%" + conditions[1] << first + "%" + else + name = names.join + conditions[0] << "(#{_(:last_name, :person)} LIKE ? OR #{_(:first_name, :person)} LIKE ?) " + conditions[1] << name+'%' + conditions[1] << name+'%' + end + if params[:filter_ids].present? + conditions[0] << "#{_(:id, :person)} NOT IN(?)" + conditions[1] << params[:filter_ids] + end + + # Scope by the user's ministry / campus involvements + involvement_condition = "(" + if my_campus_ids.present? + involvement_condition += "#{CampusInvolvement.table_name}.#{_(:campus_id, :campus_involvement)} IN(?) OR " + conditions[1] << my_campus_ids + end + involvement_condition += "#{MinistryInvolvement.table_name}.#{_(:ministry_id, :ministry_involvement)} IN(?) )" + + conditions[0] << involvement_condition + conditions[1] << current_ministry.self_plus_descendants.collect(&:id) + + @conditions = [ conditions[0].join(' AND ') ] + conditions[1] + + includes = [:current_address, :campus_involvements, :ministry_involvements] + @people = Person.find(:all, :order => "#{_(:last_name, :person)}, #{_(:first_name, :person)}", :conditions => @conditions, :include => includes) + respond_to do |format| + if params[:context] + format.js {render :partial => params[:context] + '/results', :locals => {:people => @people, :type => params[:type], :group_id => params[:group_id]}} + else + format.js {render :action => 'results'} + end + end + else + render :nothing => true + end + end # GET /people/show # Shows a person's profile (address info, assignments, involvements, etc) @@ -503,49 +512,6 @@ class PeopleController < ApplicationController end end end - - # Executes a search according to provided criteria. - # Guesses if the entry includes a first and last name, splits them out for the search - # TODO: Check it can handle two word lastnames like mine "Andrew de Jonge" - - def search - # figure out if the search parameter looks like a first or last name only, or both - @search = params[:search] - if @search && !@search.empty? - names = @search.strip.split(' ') - conditions = [[],[]] - if (names.size > 1) - first = names[0].to_s - last = names[1].to_s - conditions[0] << "#{_(:last_name, :person)} LIKE ? AND #{_(:first_name, :person)} LIKE ? " - conditions[1] << last + "%" - conditions[1] << first + "%" - else - name = names.join - conditions[0] << "(#{_(:last_name, :person)} LIKE ? OR #{_(:first_name, :person)} LIKE ?) " - conditions[1] << name+'%' - conditions[1] << name+'%' - end - if params[:filter_ids].present? - conditions[0] << "#{_(:id, :person)} NOT IN(?)" - conditions[1] << params[:filter_ids] - end - conditions[0] = add_involvement_conditions(conditions[0], true) - @conditions = [ conditions[0].join(' AND ') ] + conditions[1] - - includes = [:current_address, :campus_involvements, :ministry_involvements] - @people = Person.find(:all, :order => "#{_(:last_name, :person)}, #{_(:first_name, :person)}", :conditions => @conditions, :include => includes) - respond_to do |format| - if params[:context] - format.js {render :partial => params[:context] + '/results', :locals => {:people => @people, :type => params[:type], :group_id => params[:group_id]}} - else - format.js {render :action => 'results'} - end - end - else - render :nothing => true - end - end # Question: what does it do? def add_student @@ -576,13 +542,13 @@ class PeopleController < ApplicationController end redirect_to @person end -#### THIS METHOD WAS DEFINED TWICE! ##### - # def get_campuses - # @campus_state = params[:primary_campus_state] - # @campus_country = params[:primary_campus_country] - # render :text => '' unless @campus_state - # @campuses = CmtGeo.campuses_for_state(@campus_state, @campus_country) || [] - # end + + def get_campuses + @campus_state = params[:primary_campus_state] + @campus_country = params[:primary_campus_country] + render :text => '' unless @campus_state + @campuses = CmtGeo.campuses_for_state(@campus_state, @campus_country) || [] + end def get_campus_states @campus_country = params[:primary_campus_country] @@ -640,41 +606,6 @@ class PeopleController < ApplicationController end end - - def campus_involvements_field(safe_format = false) - if safe_format - "campus_involvements.#{_(:campus_id, :campus_involvement)}" - else - "CampusInvolvement.#{_(:campus_id, :campus_involvement)}" - end - end - - def campus_condition(safe_format = false) - campus_involvements_field(safe_format) + " IN (#{@ministry.campus_ids.join(',')})" - end - - def ministry_condition(safe_format = false) - @ministry_ids ||= @my.ministry_involvements.collect(&:ministry_id).join(',') - if safe_format - 'ministry_involvements.' + _(:ministry_id, :ministry_involvement) + " IN (#{@ministry_ids})" - else - 'MinistryInvolvement.' + _(:ministry_id, :ministry_involvement) + " IN (#{@ministry_ids})" - end - end - - def add_involvement_conditions(conditions, safe_format = false) - # figure out which campuses to query based on the campuses listed for the current ministry - if @campus - campus_cond = campus_involvements_field(safe_format) + " = #{@campus.id}" - conditions << campus_cond - elsif @ministry.campus_ids.length > 0 - conditions << '( ' + campus_condition(safe_format) + ' OR ' + ministry_condition(safe_format) + ' )' - else - conditions << ministry_condition(safe_format) - end - return conditions - end - def render_new_from_create(format) set_dorms format.html { render :action => "new", :layout => 'manage' } @@ -799,15 +730,62 @@ class PeopleController < ApplicationController @use_address2 = !Cmt::CONFIG[:disable_address2] end - private + def my_campuses + @my_campuses ||= @my.campus_list(get_ministry_involvement(@ministry)) + end + + def my_campus_ids + @my_campus_ids ||= my_campuses.collect(&:id) + end def get_campuses - campuses = @my.ministries.collect {|ministry| ministry.campuses.find(:all)}.flatten.uniq - mi = get_ministry_involvement(@ministry) - if mi && mi.ministry_role.class == StudentRole - @campuses = campuses.select{|id| @my.campuses.find(:first, :conditions => {_(:id, :campus) => id})} + @campuses = @my_campuses + end + + def add_involvement_conditions(conditions) + # figure out which campuses to query based on the campuses listed for the current ministry + # Check ministry + ministry_condition = '' + if params[:ministry] + # Only consider ministry ids that this person is involved in (stop deviousness) + params[:ministry] = params[:ministry].collect(&:to_i) & @my.ministry_involvements.collect(&:ministry_id) + unless params[:ministry].empty? + ministry_condition = "MinistryInvolvement.#{_(:ministry_id, :ministry_involvement)} IN(#{quote_string(params[:ministry].join(','))})" + @search_for << Ministry.find(:all, :conditions => "id in(#{quote_string(params[:ministry].join(','))})").collect(&:name).join(', ') + @advanced = true + end + else + ministry_condition = "MinistryInvolvement.#{_(:ministry_id, :ministry_involvement)} IN(#{quote_string(current_ministry.self_plus_descendants.collect(&:id).join(','))})" end - @campuses ||= campuses + @tables[MinistryInvolvement] = "Person.#{_(:id, :person)} = MinistryInvolvement.#{_(:person_id, :ministry_involvement)}" if @tables + + # Check campus + campus_condition = '' + if params[:campus].present? + # Only consider campus ids that this person is involved in (stop deviousness) + params[:campus] = params[:campus].collect(&:to_i) & my_campuses.collect(&:id) + unless params[:campus].empty? + conditions << "CampusInvolvement.#{_(:campus_id, :campus_involvement)} IN(#{quote_string(params[:campus].join(','))}) AND CampusInvolvement.#{_(:end_date, :campus_involvement)} is NULL" + @search_for << Campus.find(:all, :conditions => "#{_(:id, :campus)} in (#{quote_string(params[:campus].join(','))})").collect(&:name).join(', ') + @tables[CampusInvolvement] = "#{Person.table_name}.#{_(:id, :person)} = CampusInvolvement.#{_(:person_id, :campus_involvement)}" if @tables + @advanced = true + end + else + # If no campuses were passed in... + mi = get_ministry_involvement(current_ministry) + # If the user is a student, just look at their campus involvements under the current ministry + # If the user is staff, look at all campuses in the current ministry tree + campus_ids = mi && mi.ministry_role.class == StudentRole ? (current_ministry.campus_ids & my_campuses.collect(&:id)) : current_ministry.campus_ids + campus_condition = "CampusInvolvement.#{_(:campus_id, :campus_involvement)} IN(#{quote_string(campus_ids.join(','))})" if campus_ids.present? + end + + if campus_condition.present? + conditions << ('(' + ministry_condition + ' OR ' + campus_condition + ')') + @tables[CampusInvolvement] = "#{Person.table_name}.#{_(:id, :person)} = CampusInvolvement.#{_(:person_id, :campus_involvement)}" if @tables + else + conditions << ministry_condition + end + return conditions end end app/controllers/people_controller.rb @@ -18,8 +18,7 @@ class Ministry < ActiveRecord::Base has_many :campus_involvements # has_many :people, :through => :campus_involvements has_many :people, :through => :ministry_involvements - has_many :ministry_campuses, :include => :campus, :dependent => :destroy, - :include => :campus, :order => Campus.table_name + '.' + _(:name, :campus) + has_many :ministry_campuses, :include => :campus, :dependent => :destroy, :order => Campus.table_name + '.' + _(:name, :campus) has_many :campuses, :through => :ministry_campuses, :order => _(:name, 'campus') has_many :ministry_involvements, :dependent => :destroy, :dependent => :destroy has_many :groups, :dependent => :destroy @@ -76,6 +75,14 @@ class Ministry < ActiveRecord::Base self.root? ? my_other_roles : self.root.my_other_roles end + def unique_campuses + unless @unique_campuses + res = lambda {Campus.find(campus_ids)} + @unique_campuses = (Rails.env.production? ? Rails.cache.fetch([self, 'unique_campuses']) {res.call} : res.call) + end + return @unique_campuses + end + def subministry_campuses(top = true) unless @subministry_campuses @subministry_campuses = top ? [] : self.ministry_campuses @@ -85,15 +92,18 @@ class Ministry < ActiveRecord::Base end return @subministry_campuses end - - def unique_campuses - unless @unique_campuses - @unique_ministry_campuses = ministry_campuses.clone - @unique_campuses = campuses.clone - subministry_campuses.each do |mc| - @unique_ministry_campuses << mc unless @unique_campuses.include?(mc.campus) - @unique_campuses << mc.campus - end + + def unique_ministry_campuses + unless @unique_ministry_campuses + res = lambda { + @unique_ministry_campuses = ministry_campuses.clone + @unique_campuses = campuses.clone + subministry_campuses.each do |mc| + @unique_ministry_campuses << mc unless @unique_campuses.include?(mc.campus) + @unique_campuses << mc.campus + end + } + @unique_ministry_campuses = (Rails.env.production? ? Rails.cache.fetch([self, 'unique_ministry_campuses']) {res.call} : res.call) end return @unique_ministry_campuses end @@ -112,9 +122,12 @@ class Ministry < ActiveRecord::Base def campus_ids unless @campus_ids - ministry_ids = ([self] + descendants).collect(&:id) - sql = "SELECT #{_(:campus_id, :ministry_campus)} FROM #{MinistryCampus.table_name} WHERE #{_(:ministry_id, :ministry_campus)} IN(#{ministry_ids.join(',')})" - @campus_ids = ActiveRecord::Base.connection.select_values(sql).collect(&:to_i) + res = lambda { + ministry_ids = self_plus_descendants.collect(&:id) + sql = "SELECT #{_(:campus_id, :ministry_campus)} FROM #{MinistryCampus.table_name} WHERE #{_(:ministry_id, :ministry_campus)} IN(#{ministry_ids.join(',')})" + ActiveRecord::Base.connection.select_values(sql).collect(&:to_i) + } + @campus_ids = Rails.env.production? ? Rails.cache.fetch([self, 'campus_ids']) {res.call} : res.call end @campus_ids end @@ -171,8 +184,9 @@ class Ministry < ActiveRecord::Base @involved_student_role_ids ||= involved_student_roles.collect(&:id) end - def all_ministries - (self.descendants + [self]).sort + def self_plus_descendants + res = lambda {(self.descendants + [self]).sort} + Rails.env.production? ? Rails.cache.fetch([self, 'self_plus_descendants']) {res.call} : res.call end def deleteable? app/models/ministry.rb @@ -196,8 +196,22 @@ end # end def ministry_tree - res = lambda {(self.ministries.collect(&:ancestors).flatten + self.ministries.collect(&:descendants).flatten).uniq} - Rails.env.production? ? Rails.cache.fetch([self.cache_key, 'ministry_tree']) {res.call} : res.call + res = lambda { + ministries = self.ministries.find(:all, :include => [:parent, :children]) + (ministries.collect(&:ancestors).flatten + ministries.collect(&:descendants).flatten).uniq + } + Rails.env.production? ? Rails.cache.fetch([self, 'ministry_tree']) {res.call} : res.call + end + + def campus_list(ministry_involvement) + res = lambda { + if ministry_involvement && ministry_involvement.ministry_role.class == StudentRole + self.campuses + else + self.ministries.collect {|ministry| ministry.campuses.find(:all)}.flatten.uniq + end + } + Rails.env.production? ? Rails.cache.fetch([self, 'campus_list', ministry_involvement]) {res.call} : res.call end def role(ministry) app/models/person.rb @@ -19,7 +19,7 @@ <%= spinner %> <% if @my.ministries.length > 1 %> <%- if is_admin? -%> - Current Ministry: <%= select_tag(:current_ministry, options_for_select(current_ministry.root.all_ministries.collect {|m| [m.name + " #{m.parent ? '(' + m.parent.name + ')' : ''}", m.id]}, @ministry.id)) %>  + Current Ministry: <%= select_tag(:current_ministry, options_for_select(current_ministry.root.self_plus_descendants.collect {|m| [m.name + " #{m.parent ? '(' + m.parent.name + ')' : ''}", m.id]}, @ministry.id)) %>  <%- else -%> Current Ministry: <%= select_tag(:current_ministry, options_for_select(@my.ministry_tree.sort.collect {|m| [m.name + " #{m.parent ? '(' + m.parent.name + ')' : ''}", m.id]}, @ministry.id)) %>  <%- end -%> @@ -145,7 +145,7 @@ <div id="campus-panel"></div> <div id="edit-ministry" style="display:none"> <div id="ministry"><%= render :partial => 'ministries/form' %></div> - <div id="campus-details"><%#= render :partial => 'campuses/campus', :locals => {:campus => @ministry.unique_campuses.first.campus} unless @ministry.unique_campuses.empty? %></div> + <div id="campus-details"><%#= render :partial => 'campuses/campus', :locals => {:campus => @ministry.unique_campuses.first} unless @ministry.unique_campuses.empty? %></div> </div> </div> <div id="campuses"> app/views/ministries/_ministries.html.erb @@ -3,5 +3,5 @@ update_flash(page, flash[:notice]) page[:title].replace_html(@ministry.name) page[:instructions].replace_html(:partial => 'ministries/instructions') page.call('tabs.setActiveTab', 0) -page['campus_list'].replace_html :partial => @ministry.unique_campuses +page['campus_list'].replace_html :partial => @ministry.unique_ministry_campuses page[:ministry].replace_html(:partial => 'form') app/views/ministries/destroy.rjs @@ -3,14 +3,6 @@ <ul id="direct_campus_list"> <%= render :partial => @ministry.ministry_campuses %> </ul> -  </div> <br/> <div> app/views/ministry_campuses/_campuses.html.erb @@ -3,7 +3,7 @@ <tr> <td>Main School: </td> <td> - <%= select_tag :campus, options_for_select(@ministry.unique_campuses.collect {|c| [c.campus.name, c.campus.id]})%> + <%= select_tag :campus, options_for_select(@ministry.unique_campuses.collect {|c| [c.name, c.id]})%> </td> </tr> <table> app/views/staff/_add_campus.html.erb @@ -20,3 +20,16 @@ config.action_mailer.raise_delivery_errors = false # turn log level down so that the SQL statements are not visible in the webserver logs #config.log_level = :info + +# config.after_initialize do +# Bullet.enable = true +# Bullet.bullet_logger = true +# # Bullet.console = true +# begin +# require 'ruby-growl' +# Bullet.growl = true +# rescue MissingSourceFile +# Bullet.alert = true +# end +# Bullet.rails_logger = true +# end config/environments/development.rb @@ -38,6 +38,14 @@ class PeopleControllerTest < ActionController::TestCase assert assigns(:people) end + test "A person with no campus involvements should still show in the directory" do + login('staff_on_ministry_with_no_campus') + session[:ministry_id] = ministries(:top).id + get :directory + assert ppl = assigns(:people) + assert(ppl.detect {|p| p['person_id'].to_i == people(:staff_on_ministry_with_no_campus).id}, "staff_on_ministry_with_no_campus didn't show up.") + end + test "perform search by firstname" do post :directory, :search => 'josh' assert_response :success @@ -237,7 +245,8 @@ class PeopleControllerTest < ActionController::TestCase ministry = ministries(:no_ministry) ministry_involvements = MinistryInvolvement.find_all_by_person_id(person.id) assert ministry_involvements.any?{ |mr| mr.ministry_id == ministry.id } - assert_redirected_to :action => "index", :controller => "dashboard" + # assert_redirected_to :action => "index", :controller => "dashboard" + assert_response :success, @response.body end test "ministry leader with no permanent address should render when updating notes" do test/functional/people_controller_test.rb @@ -25,8 +25,8 @@ class MinistryTest < ActiveSupport::TestCase assert_equal(Ministry.find(1), Ministry.find(2).root) end - def test_all_ministries - assert_equal([Ministry.find(2), Ministry.find(3)], Ministry.find(2).all_ministries) + def test_self_plus_descendants + assert_equal([Ministry.find(2), Ministry.find(3)], Ministry.find(2).self_plus_descendants) end def test_create_first_view test/unit/ministry_test.rb doc/app/classes/Address.html doc/app/classes/AddressesController.html doc/app/classes/AddressesHelper.html doc/app/classes/AdminHelper.html doc/app/classes/ApplicationController.html doc/app/classes/ApplicationHelper.html doc/app/classes/ApplicationMailer.html doc/app/classes/AuthenticatedSystem.html doc/app/classes/AuthenticatedTestHelper.html doc/app/classes/BadParams.html doc/app/classes/BibleStudiesHelper.html doc/app/classes/Campus.html doc/app/classes/CampusInvolvement.html doc/app/classes/CampusInvolvementsController.html doc/app/classes/CampusInvolvementsHelper.html doc/app/classes/CampusesController.html doc/app/classes/CampusesHelper.html doc/app/classes/College.html doc/app/classes/Column.html doc/app/classes/ColumnsController.html doc/app/classes/ColumnsHelper.html doc/app/classes/Conference.html doc/app/classes/ConferenceRegistration.html doc/app/classes/ContactsController.html doc/app/classes/ContactsHelper.html doc/app/classes/Correspondence.html doc/app/classes/CorrespondenceType.html doc/app/classes/CorrespondenceTypesController.html doc/app/classes/CorrespondenceTypesHelper.html doc/app/classes/CorrespondencesController.html doc/app/classes/CorrespondencesHelper.html doc/app/classes/Country.html doc/app/classes/County.html doc/app/classes/CurrentAddress.html doc/app/classes/CustomAttribute.html doc/app/classes/CustomAttributesController.html doc/app/classes/CustomAttributesHelper.html doc/app/classes/CustomValue.html doc/app/classes/CustomizeController.html doc/app/classes/CustomizeHelper.html doc/app/classes/DashboardController.html doc/app/classes/DashboardHelper.html doc/app/classes/DevelopersController.html doc/app/classes/DevelopersHelper.html doc/app/classes/DirectoryHelper.html doc/app/classes/Dorm.html doc/app/classes/DormsController.html doc/app/classes/DormsHelper.html doc/app/classes/EmailTemplate.html doc/app/classes/EmailTemplatesController.html doc/app/classes/EmailTemplatesHelper.html doc/app/classes/EmergencyAddress.html doc/app/classes/FacebookHelper.html doc/app/classes/FilesController.html doc/app/classes/FilesHelper.html doc/app/classes/FreeTime.html doc/app/classes/Group.html doc/app/classes/GroupInvolvement.html doc/app/classes/GroupInvolvementsController.html doc/app/classes/GroupInvolvementsHelper.html doc/app/classes/GroupType.html doc/app/classes/GroupTypesController.html doc/app/classes/GroupTypesHelper.html doc/app/classes/GroupsController.html doc/app/classes/GroupsHelper.html doc/app/classes/HighSchool.html doc/app/classes/Import.html doc/app/classes/ImportsController.html doc/app/classes/ImportsHelper.html doc/app/classes/InvolvementController.html doc/app/classes/InvolvementHelper.html doc/app/classes/InvolvementQuestion.html doc/app/classes/InvolvementQuestionsController.html doc/app/classes/InvolvementQuestionsHelper.html doc/app/classes/ManageController.html doc/app/classes/MinistriesController.html doc/app/classes/MinistriesHelper.html doc/app/classes/Ministry.html doc/app/classes/MinistryCampus.html doc/app/classes/MinistryCampusesController.html doc/app/classes/MinistryCampusesHelper.html doc/app/classes/MinistryInvolovementsHelper.html doc/app/classes/MinistryInvolvement.html doc/app/classes/MinistryInvolvementsController.html doc/app/classes/MinistryRole.html doc/app/classes/MinistryRolePermission.html doc/app/classes/MinistryRolePermissionsController.html doc/app/classes/MinistryRolePermissionsHelper.html doc/app/classes/MinistryRolesController.html doc/app/classes/MinistryRolesHelper.html doc/app/classes/OtherRole.html doc/app/classes/PeopleController.html doc/app/classes/PeopleHelper.html doc/app/classes/PermanentAddress.html doc/app/classes/Permission.html doc/app/classes/PermissionsController.html doc/app/classes/PermissionsHelper.html doc/app/classes/Person.html doc/app/classes/PersonMethods.html doc/app/classes/ProfilePicture.html doc/app/classes/ProfilePicturesController.html doc/app/classes/ProfilePicturesHelper.html doc/app/classes/ProfileQuestion.html doc/app/classes/ProfileQuestionsController.html doc/app/classes/ProfileQuestionsHelper.html doc/app/classes/SchoolYear.html doc/app/classes/SchoolYearsController.html doc/app/classes/SchoolYearsHelper.html doc/app/classes/Search.html doc/app/classes/SessionsController.html doc/app/classes/SessionsHelper.html doc/app/classes/Staff.html doc/app/classes/StaffController.html doc/app/classes/StaffHelper.html doc/app/classes/StaffRole.html doc/app/classes/State.html doc/app/classes/StintApplication.html doc/app/classes/StintLocation.html doc/app/classes/StudentRole.html doc/app/classes/StudentsController.html doc/app/classes/StudentsHelper.html doc/app/classes/SummerProject.html doc/app/classes/SummerProjectApplication.html doc/app/classes/TeamsHelper.html doc/app/classes/Timetable.html doc/app/classes/TimetablesController.html doc/app/classes/TimetablesHelper.html doc/app/classes/TrainingAnswer.html doc/app/classes/TrainingCategoriesController.html doc/app/classes/TrainingCategoriesHelper.html doc/app/classes/TrainingCategory.html doc/app/classes/TrainingController.html doc/app/classes/TrainingHelper.html doc/app/classes/TrainingQuestion.html doc/app/classes/TrainingQuestionActivation.html doc/app/classes/TrainingQuestionsController.html doc/app/classes/TrainingQuestionsHelper.html doc/app/classes/UrlFilters.html doc/app/classes/User.html doc/app/classes/UserMailer.html doc/app/classes/UsersController.html doc/app/classes/UsersHelper.html doc/app/classes/View.html doc/app/classes/ViewColumn.html doc/app/classes/ViewColumnsController.html doc/app/classes/ViewColumnsHelper.html doc/app/classes/ViewsController.html doc/app/classes/ViewsHelper.html doc/app/created.rid doc/app/files/app/controllers/addresses_controller_rb.html doc/app/files/app/controllers/application_controller_rb.html doc/app/files/app/controllers/campus_involvements_controller_rb.html doc/app/files/app/controllers/campuses_controller_rb.html doc/app/files/app/controllers/columns_controller_rb.html doc/app/files/app/controllers/contacts_controller_rb.html doc/app/files/app/controllers/correspondence_types_controller_rb.html doc/app/files/app/controllers/correspondences_controller_rb.html doc/app/files/app/controllers/custom_attributes_controller_rb.html doc/app/files/app/controllers/customize_controller_rb.html doc/app/files/app/controllers/dashboard_controller_rb.html doc/app/files/app/controllers/developers_controller_rb.html doc/app/files/app/controllers/dorms_controller_rb.html doc/app/files/app/controllers/email_templates_controller_rb.html doc/app/files/app/controllers/files_controller_rb.html doc/app/files/app/controllers/group_involvements_controller_rb.html doc/app/files/app/controllers/group_types_controller_rb.html doc/app/files/app/controllers/groups_controller_rb.html doc/app/files/app/controllers/imports_controller_rb.html doc/app/files/app/controllers/involvement_controller_rb.html doc/app/files/app/controllers/involvement_questions_controller_rb.html doc/app/files/app/controllers/manage_controller_rb.html doc/app/files/app/controllers/ministries_controller_rb.html doc/app/files/app/controllers/ministry_campuses_controller_rb.html doc/app/files/app/controllers/ministry_involvements_controller_rb.html doc/app/files/app/controllers/ministry_role_permissions_controller_rb.html doc/app/files/app/controllers/ministry_roles_controller_rb.html doc/app/files/app/controllers/people_controller_rb.html doc/app/files/app/controllers/permissions_controller_rb.html doc/app/files/app/controllers/profile_pictures_controller_rb.html doc/app/files/app/controllers/profile_questions_controller_rb.html doc/app/files/app/controllers/school_years_controller_rb.html doc/app/files/app/controllers/sessions_controller_rb.html doc/app/files/app/controllers/staff_controller_rb.html doc/app/files/app/controllers/students_controller_rb.html doc/app/files/app/controllers/timetables_controller_rb.html doc/app/files/app/controllers/training_categories_controller_rb.html doc/app/files/app/controllers/training_controller_rb.html doc/app/files/app/controllers/training_questions_controller_rb.html doc/app/files/app/controllers/users_controller_rb.html doc/app/files/app/controllers/view_columns_controller_rb.html doc/app/files/app/controllers/views_controller_rb.html doc/app/files/app/helpers/addresses_helper_rb.html doc/app/files/app/helpers/admin_helper_rb.html doc/app/files/app/helpers/application_helper_rb.html doc/app/files/app/helpers/bible_studies_helper_rb.html doc/app/files/app/helpers/campus_involvements_helper_rb.html doc/app/files/app/helpers/campuses_helper_rb.html doc/app/files/app/helpers/columns_helper_rb.html doc/app/files/app/helpers/contacts_helper_rb.html doc/app/files/app/helpers/correspondence_types_helper_rb.html doc/app/files/app/helpers/correspondences_helper_rb.html doc/app/files/app/helpers/custom_attributes_helper_rb.html doc/app/files/app/helpers/customize_helper_rb.html doc/app/files/app/helpers/dashboard_helper_rb.html doc/app/files/app/helpers/developers_helper_rb.html doc/app/files/app/helpers/directory_helper_rb.html doc/app/files/app/helpers/dorms_helper_rb.html doc/app/files/app/helpers/email_templates_helper_rb.html doc/app/files/app/helpers/facebook_helper_rb.html doc/app/files/app/helpers/files_helper_rb.html doc/app/files/app/helpers/group_involvements_helper_rb.html doc/app/files/app/helpers/group_types_helper_rb.html doc/app/files/app/helpers/groups_helper_rb.html doc/app/files/app/helpers/imports_helper_rb.html doc/app/files/app/helpers/involvement_helper_rb.html doc/app/files/app/helpers/involvement_questions_helper_rb.html doc/app/files/app/helpers/ministries_helper_rb.html doc/app/files/app/helpers/ministry_campuses_helper_rb.html doc/app/files/app/helpers/ministry_involovements_helper_rb.html doc/app/files/app/helpers/ministry_role_permissions_helper_rb.html doc/app/files/app/helpers/ministry_roles_helper_rb.html doc/app/files/app/helpers/people_helper_rb.html doc/app/files/app/helpers/permissions_helper_rb.html doc/app/files/app/helpers/profile_pictures_helper_rb.html doc/app/files/app/helpers/profile_questions_helper_rb.html doc/app/files/app/helpers/school_years_helper_rb.html doc/app/files/app/helpers/sessions_helper_rb.html doc/app/files/app/helpers/staff_helper_rb.html doc/app/files/app/helpers/students_helper_rb.html doc/app/files/app/helpers/teams_helper_rb.html doc/app/files/app/helpers/timetables_helper_rb.html doc/app/files/app/helpers/training_categories_helper_rb.html doc/app/files/app/helpers/training_helper_rb.html doc/app/files/app/helpers/training_questions_helper_rb.html doc/app/files/app/helpers/users_helper_rb.html doc/app/files/app/helpers/view_columns_helper_rb.html doc/app/files/app/helpers/views_helper_rb.html doc/app/files/app/models/address_rb.html doc/app/files/app/models/campus_involvement_rb.html doc/app/files/app/models/campus_rb.html doc/app/files/app/models/college_rb.html doc/app/files/app/models/column_rb.html doc/app/files/app/models/conference_rb.html doc/app/files/app/models/conference_registration_rb.html doc/app/files/app/models/correspondence_rb.html doc/app/files/app/models/correspondence_type_rb.html doc/app/files/app/models/country_rb.html doc/app/files/app/models/county_rb.html doc/app/files/app/models/current_address_rb.html doc/app/files/app/models/custom_attribute_rb.html doc/app/files/app/models/custom_value_rb.html doc/app/files/app/models/dorm_rb.html doc/app/files/app/models/email_template_rb.html doc/app/files/app/models/emergency_address_rb.html doc/app/files/app/models/free_time_rb.html doc/app/files/app/models/group_involvement_rb.html doc/app/files/app/models/group_rb.html doc/app/files/app/models/group_type_rb.html doc/app/files/app/models/high_school_rb.html doc/app/files/app/models/import_rb.html doc/app/files/app/models/involvement_question_rb.html doc/app/files/app/models/ministry_campus_rb.html doc/app/files/app/models/ministry_involvement_rb.html doc/app/files/app/models/ministry_rb.html doc/app/files/app/models/ministry_role_permission_rb.html doc/app/files/app/models/ministry_role_rb.html doc/app/files/app/models/other_role_rb.html doc/app/files/app/models/permanent_address_rb.html doc/app/files/app/models/permission_rb.html doc/app/files/app/models/person_rb.html doc/app/files/app/models/profile_picture_rb.html doc/app/files/app/models/profile_question_rb.html doc/app/files/app/models/school_year_rb.html doc/app/files/app/models/search_rb.html doc/app/files/app/models/staff_rb.html doc/app/files/app/models/staff_role_rb.html doc/app/files/app/models/state_rb.html doc/app/files/app/models/stint_application_rb.html doc/app/files/app/models/stint_location_rb.html doc/app/files/app/models/student_role_rb.html doc/app/files/app/models/summer_project_application_rb.html doc/app/files/app/models/summer_project_rb.html doc/app/files/app/models/timetable_rb.html doc/app/files/app/models/training_answer_rb.html doc/app/files/app/models/training_category_rb.html doc/app/files/app/models/training_question_activation_rb.html doc/app/files/app/models/training_question_rb.html doc/app/files/app/models/user_mailer_rb.html doc/app/files/app/models/user_rb.html doc/app/files/app/models/view_column_rb.html doc/app/files/app/models/view_rb.html doc/app/files/doc/README_FOR_APP.html doc/app/files/lib/authenticated_system_rb.html doc/app/files/lib/authenticated_test_helper_rb.html doc/app/files/lib/person_methods_rb.html doc/app/files/lib/register_users_on_facebook_rb.html doc/app/files/lib/test_timetable_rb.html doc/app/fr_class_index.html doc/app/fr_file_index.html doc/app/fr_method_index.html doc/app/index.html doc/app/rdoc-style.css 999ff5fcb2dbb954e1d2f16b5fa92d49cd10b1d4 Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local http://github.com/twinge/ministry-tracker/commit/14bd930dff948766f6ce5ed01a19b097c39ebc9c 14bd930dff948766f6ce5ed01a19b097c39ebc9c

2009-09-13T22:53:06-07:00

fixed http://jira.uscm.org/browse/SN-61 refactored directory code some removed auto generated documentation b2958e917c5cde67889b7722f72f0f0549d27e91 Josh Starcher josh@Josh-Starchers-MacBook-Pro-15.local