Skip to content

Commit

Permalink
Minor formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
TuckerJD committed Aug 4, 2014
1 parent 467180b commit ff0d85d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
20 changes: 10 additions & 10 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


# Vetted / tested

# All models that use data controllers should include this concern.
# See http://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/Concerns.html to extend it to take options if need be.
# TODO: This will have to be broken down to core_data_routes, and supporting_data_routes
Expand All @@ -20,14 +20,14 @@
root 'dashboard#index'

match '/dashboard', to: 'dashboard#index', via: :get
match '/signin', to: 'sessions#new', via: :get
match '/signout', to: 'sessions#destroy', via: :delete
match '/signin', to: 'sessions#new', via: :get
match '/signout', to: 'sessions#destroy', via: :delete
resources :sessions, only: :create
resources :projects do

resources :projects do
member do
get 'select'
get 'settings_for'
get 'settings_for'
end
end

Expand All @@ -46,7 +46,7 @@

match '/forgot_password', to: 'users#forgot_password', via: 'get'

resources :alternate_values
resources :alternate_values
resources :biocuration_classifications
resources :citation_topics
resources :citations
Expand All @@ -61,7 +61,7 @@
end
resources :collection_profiles
resources :contents

resources :controlled_vocabulary_terms do
concerns [:data_routes]
end
Expand Down Expand Up @@ -101,8 +101,8 @@
resources :taxon_name_classifications
resources :taxon_name_relationships

match 'quick_verbatim_material_task', to: 'tasks/accessions/quick/verbatim_material#new', via: 'get'
post 'tasks/accessions/quick/verbatim_material/create'
match 'quick_verbatim_material_task', to: 'tasks/accessions/quick/verbatim_material#new', via: 'get'
post 'tasks/accessions/quick/verbatim_material/create'

match 'build_biocuration_groups_task', to: 'tasks/controlled_vocabularies/biocuration#build_collection', via: 'get'
match 'build_biocuration_group', to: 'tasks/controlled_vocabularies/biocuration#build_biocuration_group', via: 'post'
Expand Down
36 changes: 18 additions & 18 deletions db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@

case Rails.env

when 'development'

# Creates 1,1 project/users
FactoryGirl.create(:valid_user)
FactoryGirl.create(:valid_project)
FactoryGirl.create(:project_member, project_id: 1, user_id: 1)
# These will interfere with importing geographic_items.dmp because it creates related records
# FactoryGirl.create(:level2_geographic_area)
# FactoryGirl.create(:geographic_item_with_polygon)
FactoryGirl.create(:iczn_subspecies)
FactoryGirl.create(:icn_variety)

when 'production'
# Never ever do anything. Production should be seeded with a Rake task or deploy script if need be.

when 'test'
when 'development'

# Creates 1,1 project/users
FactoryGirl.create(:valid_user)
FactoryGirl.create(:valid_project)
FactoryGirl.create(:project_member, project_id: 1, user_id: 1)

# These will interfere with importing geographic_items.dmp because it creates related records
# FactoryGirl.create(:level2_geographic_area)
# FactoryGirl.create(:geographic_item_with_polygon)

FactoryGirl.create(:iczn_subspecies)
FactoryGirl.create(:icn_variety)

when 'production'
# Never ever do anything. Production should be seeded with a Rake task or deploy script if need be.

when 'test'


end

0 comments on commit ff0d85d

Please sign in to comment.