mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-12-26 04:21:36 +00:00
Prefer 1.9 hash syntax
Remove unused log entries?
This commit is contained in:
parent
60404adf63
commit
180ab8a408
6 changed files with 14 additions and 12 deletions
|
@ -175,6 +175,8 @@ GEM
|
||||||
activesupport (= 3.2.18)
|
activesupport (= 3.2.18)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.18)
|
railties (= 3.2.18)
|
||||||
|
rails_autolink (1.1.5)
|
||||||
|
rails (> 3.1)
|
||||||
railties (3.2.18)
|
railties (3.2.18)
|
||||||
actionpack (= 3.2.18)
|
actionpack (= 3.2.18)
|
||||||
activesupport (= 3.2.18)
|
activesupport (= 3.2.18)
|
||||||
|
@ -291,6 +293,7 @@ DEPENDENCIES
|
||||||
puma (~> 2.8.2)
|
puma (~> 2.8.2)
|
||||||
quiet_assets (~> 1.0.2)
|
quiet_assets (~> 1.0.2)
|
||||||
rails (~> 3.2.18)
|
rails (~> 3.2.18)
|
||||||
|
rails_autolink (~> 1.1.5)
|
||||||
rmagick (~> 2.13.2)
|
rmagick (~> 2.13.2)
|
||||||
rspec-rails (~> 2.14.1)
|
rspec-rails (~> 2.14.1)
|
||||||
sanitize (~> 2.1.0)
|
sanitize (~> 2.1.0)
|
||||||
|
|
|
@ -14,8 +14,6 @@ class TeamersController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
logger.info params
|
|
||||||
logger.info "hello world"
|
|
||||||
teamer_id = params["teamer"]
|
teamer_id = params["teamer"]
|
||||||
@teamer = Teamer.find(teamer_id)
|
@teamer = Teamer.find(teamer_id)
|
||||||
@teamer.team_id = params["id"]
|
@teamer.team_id = params["id"]
|
||||||
|
|
|
@ -15,9 +15,7 @@ class TeamsController < ApplicationController
|
||||||
raise AccessError unless @team.can_create? cuser
|
raise AccessError unless @team.can_create? cuser
|
||||||
end
|
end
|
||||||
|
|
||||||
def replace_teamer
|
def replace_teamer
|
||||||
logger.info params
|
|
||||||
logger.info "hello"
|
|
||||||
redirect_to_back
|
redirect_to_back
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="message">
|
<div class="message">
|
||||||
<div class="contents">
|
<div class="contents">
|
||||||
<%= auto_link(shoutmsg.text, :html => { :target => '_blank' }) %>
|
<%= auto_link shoutmsg.text, html: { target: '_blank' } %>
|
||||||
<% if shoutmsg.can_destroy? cuser %>
|
<% if shoutmsg.can_destroy? cuser %>
|
||||||
<%= link_to icon('times'), shoutmsg, method: :delete, class: 'destroy' %>
|
<%= link_to icon('times'), shoutmsg, method: :delete, class: 'destroy' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<h4><%= t('widget.shoutbox') %></h4>
|
<h4><%= t('widget.shoutbox') %></h4>
|
||||||
<div class="widget-content-wrapper">
|
<div class="widget-content-wrapper">
|
||||||
<div id="shoutbox" class="transcript">
|
<div id="shoutbox" class="transcript">
|
||||||
<%= render :partial => "shoutmsgs/shoutmsg", :collection => Shoutmsg.recent.box, :locals => {:popup => "$('shoutbox')"} %>
|
<%= render partial: "shoutmsgs/shoutmsg", collection: Shoutmsg.recent.box, locals: { popup: "$('shoutbox')" } %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<%= render :partial => "shoutmsgs/new", :locals => { :shoutmsg => Shoutmsg.new } %>
|
<%= render partial: "shoutmsgs/new", locals: { shoutmsg: Shoutmsg.new } %>
|
||||||
<%= link_to "Shoutbox Recent History", :controller => :shoutmsgs, :action => "index" %><br/>
|
<%= link_to "Shoutbox Recent History", controller: :shoutmsgs, action: "index" %><br/>
|
||||||
<%= link_to "Shoutbox Rules", article_path(Article::SB_RULES) %>
|
<%= link_to "Shoutbox Rules", article_path(Article::SB_RULES) %>
|
||||||
</div>
|
</div>
|
|
@ -48,9 +48,10 @@ Ensl::Application.routes.draw do
|
||||||
resources :predictions
|
resources :predictions
|
||||||
resources :rounds
|
resources :rounds
|
||||||
resources :matches do |m|
|
resources :matches do |m|
|
||||||
get :admin, :to => "matches#admin", :on => :collection
|
get :admin, to: "matches#admin", on: :collection
|
||||||
get :ref, :to => "matches#ref"
|
get :ref, to: "matches#ref"
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :maps
|
resources :maps
|
||||||
resources :logs
|
resources :logs
|
||||||
resources :log_files
|
resources :log_files
|
||||||
|
@ -127,7 +128,9 @@ Ensl::Application.routes.draw do
|
||||||
match ':controller/:action/:id'
|
match ':controller/:action/:id'
|
||||||
match ':controller/:action/:id.:format'
|
match ':controller/:action/:id.:format'
|
||||||
match ':controller/:action/:id/:id2'
|
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 :api do
|
||||||
namespace :v1 do
|
namespace :v1 do
|
||||||
resources :users
|
resources :users
|
||||||
|
|
Loading…
Reference in a new issue