Fix editing/adding locations

rohitpaulk · rohitpaulk · commit ce1779620e53 · 2015-02-05T16:58:27.000+05:30
Fix the forms, remove unused routes for locations.

+ Fix annotations in routes.rb
diff --git a/app/views/opportunities/_form.html.haml b/app/views/opportunities/_form.html.haml
@@ -24,7 +24,7 @@
   %fieldset
     -if @team.locations.any?
       =j.label :location do
-        == Select one or more locations where the candidate must be located or #{link_to('add/manage team locations', edit_team_locations_path(@team))}
+        == Select one or more locations where the candidate must be located or #{link_to('add/manage team locations', teamname_edit_path(slug: @team.slug, anchor: "locations"))}
       =j.select(:location, @team.cities+["anywhere"], {selected: (@job.location.blank? ? [] : @job.location.split("|"))}, {multiple: true})
     -else
       =j.label :location, 'Specify the city/location where the candidate must be located'
diff --git a/app/views/teams/_locations.html.haml b/app/views/teams/_locations.html.haml
@@ -13,9 +13,8 @@
           .add-map-location= link_to_add_fields('Add new location', f, :locations)
           -if @team.has_locations?
             .location-list
-              = f.fields_for :team_locations do |fields|
+              = f.fields_for :locations do |fields|
                 .item
-                  = fields.hidden_field :id
                   %fieldset
                     = fields.label :name, 'Location Name'
                     = fields.text_field :name
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,7 +1,7 @@
 # == Route Map
 #
-#                             GET                   /.json(.:format)                                       #<Proc:0x00000009e29dd0@/home/vagrant/web/config/routes.rb:270>
-#                             GET                   /teams/.json(.:format)                                 #<Proc:0x00000009e32750@/home/vagrant/web/config/routes.rb:271>
+#                             GET                   /.json(.:format)                                       #<Proc:0x00000008e12370@/home/vagrant/web/config/routes.rb:270>
+#                             GET                   /teams/.json(.:format)                                 #<Proc:0x00000008e324e0@/home/vagrant/web/config/routes.rb:271>
 #                                                   /mail_view                                             MailPreview
 #              protips_update GET|PUT               /protips/update(.:format)                              protips#update
 #               protip_update GET|PUT               /protip/update(.:format)                               protip#update
@@ -139,13 +139,6 @@
 #                 team_member GET                   /teams/:team_id/members/:id(.:format)                  members#show
 #                             PUT                   /teams/:team_id/members/:id(.:format)                  members#update
 #                             DELETE                /teams/:team_id/members/:id(.:format)                  members#destroy
-#              team_locations GET                   /teams/:team_id/locations(.:format)                    locations#index
-#                             POST                  /teams/:team_id/locations(.:format)                    locations#create
-#           new_team_location GET                   /teams/:team_id/locations/new(.:format)                locations#new
-#          edit_team_location GET                   /teams/:team_id/locations/:id/edit(.:format)           locations#edit
-#               team_location GET                   /teams/:team_id/locations/:id(.:format)                locations#show
-#                             PUT                   /teams/:team_id/locations/:id(.:format)                locations#update
-#                             DELETE                /teams/:team_id/locations/:id(.:format)                locations#destroy
 #      apply_team_opportunity POST                  /teams/:team_id/opportunities/:id/apply(.:format)      opportunities#apply
 #   activate_team_opportunity GET                   /teams/:team_id/opportunities/:id/activate(.:format)   opportunities#activate
 # deactivate_team_opportunity GET                   /teams/:team_id/opportunities/:id/deactivate(.:format) opportunities#deactivate
@@ -405,7 +398,7 @@
       get 'search'
     end
     resources :members
-    resources :locations, as: :locations
+
     resources :opportunities do
       member do
         post 'apply'
