diff --git a/Gemfile.lock b/Gemfile.lock index 39ff4d7..4b3bfc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,6 +175,8 @@ GEM activesupport (= 3.2.18) bundler (~> 1.0) railties (= 3.2.18) + rails_autolink (1.1.5) + rails (> 3.1) railties (3.2.18) actionpack (= 3.2.18) activesupport (= 3.2.18) @@ -291,6 +293,7 @@ DEPENDENCIES puma (~> 2.8.2) quiet_assets (~> 1.0.2) rails (~> 3.2.18) + rails_autolink (~> 1.1.5) rmagick (~> 2.13.2) rspec-rails (~> 2.14.1) sanitize (~> 2.1.0) diff --git a/app/controllers/teamers_controller.rb b/app/controllers/teamers_controller.rb index 9227836..28302fe 100644 --- a/app/controllers/teamers_controller.rb +++ b/app/controllers/teamers_controller.rb @@ -14,8 +14,6 @@ class TeamersController < ApplicationController end def edit - logger.info params - logger.info "hello world" teamer_id = params["teamer"] @teamer = Teamer.find(teamer_id) @teamer.team_id = params["id"] diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb index 38453c2..eb7bfe8 100644 --- a/app/controllers/teams_controller.rb +++ b/app/controllers/teams_controller.rb @@ -15,9 +15,7 @@ class TeamsController < ApplicationController raise AccessError unless @team.can_create? cuser end - def replace_teamer - logger.info params - logger.info "hello" + def replace_teamer redirect_to_back end diff --git a/app/views/shoutmsgs/_shoutmsg.html.erb b/app/views/shoutmsgs/_shoutmsg.html.erb index 2dcd558..1dd9cbe 100644 --- a/app/views/shoutmsgs/_shoutmsg.html.erb +++ b/app/views/shoutmsgs/_shoutmsg.html.erb @@ -9,7 +9,7 @@
- <%= auto_link(shoutmsg.text, :html => { :target => '_blank' }) %> + <%= auto_link shoutmsg.text, html: { target: '_blank' } %> <% if shoutmsg.can_destroy? cuser %> <%= link_to icon('times'), shoutmsg, method: :delete, class: 'destroy' %> <% end %> diff --git a/app/views/widgets/_shoutbox.html.erb b/app/views/widgets/_shoutbox.html.erb index ba3fe75..606b88e 100644 --- a/app/views/widgets/_shoutbox.html.erb +++ b/app/views/widgets/_shoutbox.html.erb @@ -2,10 +2,10 @@

<%= t('widget.shoutbox') %>

- <%= render :partial => "shoutmsgs/shoutmsg", :collection => Shoutmsg.recent.box, :locals => {:popup => "$('shoutbox')"} %> + <%= render partial: "shoutmsgs/shoutmsg", collection: Shoutmsg.recent.box, locals: { popup: "$('shoutbox')" } %>
- <%= render :partial => "shoutmsgs/new", :locals => { :shoutmsg => Shoutmsg.new } %> - <%= link_to "Shoutbox Recent History", :controller => :shoutmsgs, :action => "index" %>
+ <%= render partial: "shoutmsgs/new", locals: { shoutmsg: Shoutmsg.new } %> + <%= link_to "Shoutbox Recent History", controller: :shoutmsgs, action: "index" %>
<%= link_to "Shoutbox Rules", article_path(Article::SB_RULES) %>
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 2f2d9ca..ba366eb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -48,9 +48,10 @@ Ensl::Application.routes.draw do resources :predictions resources :rounds resources :matches do |m| - get :admin, :to => "matches#admin", :on => :collection - get :ref, :to => "matches#ref" + get :admin, to: "matches#admin", on: :collection + get :ref, to: "matches#ref" end + resources :maps resources :logs resources :log_files @@ -127,7 +128,9 @@ Ensl::Application.routes.draw do match ':controller/:action/:id' match ':controller/:action/:id.:format' match ':controller/:action/:id/:id2' - match 'teamers/replace' => 'teamers#replace', :as => 'teamers_replace' + + match 'teamers/replace', to: 'teamers#replace', as: 'teamers_replace' + namespace :api do namespace :v1 do resources :users