diff --git a/app/views/ingredients/index.html.erb b/app/views/ingredients/index.html.erb
index 8e6d44f..a78dd23 100644
--- a/app/views/ingredients/index.html.erb
+++ b/app/views/ingredients/index.html.erb
@@ -1,18 +1,18 @@
<% content_for :sidebar do %>
- <%= render :partial => 'body_trackers/sidebar' %>
+ <%= render partial: 'body_trackers/sidebar' %>
<% end %>
<%= link_to t(".heading_nutrient_view"), nutrients_project_ingredients_path(@project),
- :class => 'icon icon-stats' %>
- <%= render :partial => 'ingredients/contextual' %>
+ class: 'icon icon-stats' %>
+ <%= render partial: 'ingredients/contextual' %>
-<%= render :partial => 'ingredients/import' %>
+<%= render partial: 'ingredients/import' %>
-<%= render :partial => 'ingredients/form' %>
+<%= render partial: 'ingredients/form' %>
<%= t ".heading" %>
- <%= render :partial => 'ingredients/list' %>
+ <%= render partial: 'ingredients/list' %>
diff --git a/app/views/ingredients/nutrients.html.erb b/app/views/ingredients/nutrients.html.erb
index 2096bd4..a7596dc 100644
--- a/app/views/ingredients/nutrients.html.erb
+++ b/app/views/ingredients/nutrients.html.erb
@@ -1,18 +1,18 @@
<% content_for :sidebar do %>
- <%= render :partial => 'body_trackers/sidebar' %>
+ <%= render partial: 'body_trackers/sidebar' %>
<% end %>
<%= link_to t(".heading_ingredient_list"), project_ingredients_path(@project),
- :class => 'icon icon-list' %>
- <%= render :partial => 'ingredients/contextual' %>
+ class: 'icon icon-list' %>
+ <%= render partial: 'ingredients/contextual' %>
-<%= render :partial => 'ingredients/import' %>
+<%= render partial: 'ingredients/import' %>
-<%= render :partial => 'ingredients/form' %>
+<%= render partial: 'ingredients/form' %>
<%= t ".heading" %>
- <%= render :partial => 'ingredients/list_nutrients' %>
+ <%= render partial: 'ingredients/list_nutrients' %>
diff --git a/app/views/ingredients/toggle.js.erb b/app/views/ingredients/toggle.js.erb
index dbf0a07..c6f9efc 100644
--- a/app/views/ingredients/toggle.js.erb
+++ b/app/views/ingredients/toggle.js.erb
@@ -1,3 +1,3 @@
$('div[id^=flash_]').remove();
$('#content').prepend('<%= escape_javascript(render_flash_messages) %>');
-$('#ingredients').html('<%= escape_javascript(render :partial => 'ingredients/list') %>');
+$('#ingredients').html('<%= escape_javascript(render partial: 'ingredients/list') %>');
diff --git a/app/views/ingredients/toggle_nutrient_column.js.erb b/app/views/ingredients/toggle_nutrient_column.js.erb
index 55cd8f1..8db6246 100644
--- a/app/views/ingredients/toggle_nutrient_column.js.erb
+++ b/app/views/ingredients/toggle_nutrient_column.js.erb
@@ -1,3 +1,3 @@
$('div[id^=flash_]').remove();
$('#content').prepend('<%= escape_javascript(render_flash_messages) %>');
-$('#nutrients').html('<%= escape_javascript(render :partial => 'ingredients/list_nutrients') %>');
+$('#nutrients').html('<%= escape_javascript(render partial: 'ingredients/list_nutrients') %>');
diff --git a/app/views/layouts/_body_tracking.html.erb b/app/views/layouts/_body_tracking.html.erb
index dbe471c..3537b53 100644
--- a/app/views/layouts/_body_tracking.html.erb
+++ b/app/views/layouts/_body_tracking.html.erb
@@ -1,3 +1,3 @@
<% content_for :header_tags do %>
- <%= stylesheet_link_tag 'body_tracking', :plugin => 'body_tracking' %>
+ <%= stylesheet_link_tag 'body_tracking', plugin: 'body_tracking' %>
<% end %>
diff --git a/app/views/measurements/_form.html.erb b/app/views/measurements/_form.html.erb
index ab898e5..e8fded3 100644
--- a/app/views/measurements/_form.html.erb
+++ b/app/views/measurements/_form.html.erb
@@ -2,8 +2,8 @@
<%= t ".heading_new_measurement" %>
<%= labelled_form_for @measurement,
- :url => project_measurements_path(@project),
- :html => {:id => 'measurement-form'} do |f| %>
+ url: project_measurements_path(@project),
+ html: {id: 'measurement-form'} do |f| %>
<%= error_messages_for @measurement %>
@@ -17,19 +17,20 @@
<%= ff.select :unit_id, unit_options, {label: ''} %>
<%= ff.check_box :_destroy, {style: "display:none", label: ''} %>
<%= link_to t(".button_delete_readout"), '#',
- :class => 'icon icon-del',
- :style => (@measurement.readouts.length > 1 ? "" : "display:none"),
- :onclick => "deleteReadout(); return false;" %>
+ class: 'icon icon-del',
+ style: (@measurement.readouts.length > 1 ? "" : "display:none"),
+ onclick: "deleteReadout(); return false;" %>
<% end %>
<% end %>
- <%= link_to t(".button_add_readout"), '#', :class => 'icon icon-add',
- :onclick => 'addReadout(); return false;' %>
+ <%= link_to t(".button_add_readout"), '#', class: 'icon icon-add',
+ onclick: 'addReadout(); return false;' %>
<%= submit_tag l(:button_create) %>
- <%= link_to l(:button_cancel), "#", :onclick => '$("#add-measurement").hide()' %>
+ <%= link_to l(:button_cancel), "#",
+ onclick: '$("#add-measurement").hide(); return false;' %>
<% end %>
diff --git a/app/views/measurements/index.html.erb b/app/views/measurements/index.html.erb
index 9ca440b..f44596e 100644
--- a/app/views/measurements/index.html.erb
+++ b/app/views/measurements/index.html.erb
@@ -1,17 +1,17 @@
<% content_for :sidebar do %>
- <%= render :partial => 'body_trackers/sidebar' %>
+ <%= render partial: 'body_trackers/sidebar' %>
<% end %>
<% if User.current.allowed_to?(:manage_common, @project) %>
- <%= link_to t(".link_new_measurement"), '#', :class => 'icon icon-add',
- :onclick => '$("#add-measurement").show(); $("#measurement_name").focus(); return false;' %>
+ <%= link_to t(".link_new_measurement"), '#', class: 'icon icon-add',
+ onclick: '$("#add-measurement").show(); $("#measurement_name").focus(); return false;' %>
<% end %>
-<%= render :partial => 'measurements/form' %>
+<%= render partial: 'measurements/form' %>
<%= t ".heading" %>
- <%= render :partial => 'measurements/list' %>
+ <%= render partial: 'measurements/list' %>
diff --git a/app/views/quantities/_index.html.erb b/app/views/quantities/_index.html.erb
index 0aa4a6f..9e94879 100644
--- a/app/views/quantities/_index.html.erb
+++ b/app/views/quantities/_index.html.erb
@@ -1,5 +1,5 @@
-<%= render :partial => 'quantities/filters',
- :locals => {:url => filter_project_quantities_path(@project)} %>
+<%= render partial: 'quantities/filters',
+ locals: {url: filter_project_quantities_path(@project)} %>
<% if @quantities.any? { |q| q.persisted? } %>
@@ -68,7 +68,7 @@
<%= labelled_form_for @quantity, url: quantity_path(@quantity), method: :patch,
remote: true, html: {id: 'quantity-edit-form'} do |f| %>
- <%= render :partial => 'quantities/form', :locals => { :f => f } %>
+ <%= render partial: 'quantities/form', locals: {f: f} %>
<%= submit_tag l(:button_save) %>
<%=
link_to l(:button_cancel), "#",
diff --git a/app/views/quantities/index.html.erb b/app/views/quantities/index.html.erb
index 3069093..20d3803 100644
--- a/app/views/quantities/index.html.erb
+++ b/app/views/quantities/index.html.erb
@@ -1,11 +1,11 @@
<% content_for :sidebar do %>
- <%= render :partial => 'body_trackers/sidebar' %>
+ <%= render partial: 'body_trackers/sidebar' %>
<% end %>
<% if User.current.allowed_to?(:manage_common, @project) %>
- <%= link_to t(".link_new_quantity"), '#', :class => 'icon icon-add',
- :onclick => '$("#add-quantity").toggle(); $("#quantity_name").focus(); return false;' %>
+ <%= link_to t(".link_new_quantity"), '#', class: 'icon icon-add',
+ onclick: '$("#add-quantity").toggle(); $("#quantity_name").focus(); return false;' %>
<% end %>
@@ -13,9 +13,9 @@
<%= t ".heading_new_quantity" %>
<%= labelled_form_for @quantity,
- :url => project_quantities_path(@project),
- :html => {:id => 'quantity-add-form'} do |f| %>
- <%= render :partial => 'quantities/form', :locals => { :f => f } %>
+ url: project_quantities_path(@project),
+ html: {id: 'quantity-add-form'} do |f| %>
+ <%= render partial: 'quantities/form', locals: {f: f} %>
<%= submit_tag l(:button_create) %>
<%= link_to l(:button_cancel), "#", onclick: '$("#add-quantity").hide(); return false;' %>
<% end %>
@@ -24,5 +24,5 @@
<%= t ".heading" %>
- <%= render :partial => 'quantities/index' %>
+ <%= render partial: 'quantities/index' %>
diff --git a/app/views/quantities/index.js.erb b/app/views/quantities/index.js.erb
index 94e3c08..99235df 100644
--- a/app/views/quantities/index.js.erb
+++ b/app/views/quantities/index.js.erb
@@ -1,4 +1,4 @@
$('div[id^=flash_]').remove();
$('#content').prepend('<%= escape_javascript(render_flash_messages) %>');
-$('#quantities').html('<%= escape_javascript(render :partial => 'quantities/index') %>');
+$('#quantities').html('<%= escape_javascript(render partial: 'quantities/index') %>');
$('#quantity_domain').trigger('change');
diff --git a/app/views/sources/index.html.erb b/app/views/sources/index.html.erb
index c077c9b..11b8d53 100644
--- a/app/views/sources/index.html.erb
+++ b/app/views/sources/index.html.erb
@@ -1,11 +1,11 @@
<% content_for :sidebar do %>
- <%= render :partial => 'body_trackers/sidebar' %>
+ <%= render partial: 'body_trackers/sidebar' %>
<% end %>
<% if User.current.allowed_to?(:manage_common, @project) %>
- <%= link_to t(".link_new_source"), '#', :class => 'icon icon-add',
- :onclick => '$("#add-source").show(); $("#source_name").focus(); return false;' %>
+ <%= link_to t(".link_new_source"), '#', class: 'icon icon-add',
+ onclick: '$("#add-source").show(); $("#source_name").focus(); return false;' %>
<% end %>
@@ -13,11 +13,11 @@
<%= t ".heading_new_source" %>
<%= labelled_form_for @source,
- :url => project_sources_path(@project),
- :html => {:id => 'source-form'} do |f| %>
- <%= render :partial => 'sources/form', :locals => { :f => f } %>
+ url: project_sources_path(@project),
+ html: {id: 'source-form'} do |f| %>
+ <%= render partial: 'sources/form', locals: {f: f} %>
<%= submit_tag l(:button_create) %>
- <%= link_to l(:button_cancel), "#", :onclick => '$("#add-source").hide()' %>
+ <%= link_to l(:button_cancel), "#", onclick: '$("#add-source").hide(); return false;' %>
<% end %>
diff --git a/app/views/units/index.html.erb b/app/views/units/index.html.erb
index 8af07b9..d8b957e 100644
--- a/app/views/units/index.html.erb
+++ b/app/views/units/index.html.erb
@@ -1,11 +1,11 @@
<% content_for :sidebar do %>
- <%= render :partial => 'body_trackers/sidebar' %>
+ <%= render partial: 'body_trackers/sidebar' %>
<% end %>
<% if User.current.allowed_to?(:manage_common, @project) %>
- <%= link_to t(".link_new_unit"), '#', :class => 'icon icon-add',
- :onclick => '$("#add-unit").show(); $("#unit_shortname").focus(); return false;' %>
+ <%= link_to t(".link_new_unit"), '#', class: 'icon icon-add',
+ onclick: '$("#add-unit").show(); $("#unit_shortname").focus(); return false;' %>
<% end %>
@@ -13,11 +13,11 @@
<%= t ".heading_new_unit" %>
<%= labelled_form_for @unit,
- :url => project_units_path(@project),
- :html => {:id => 'unit-form'} do |f| %>
- <%= render :partial => 'units/form', :locals => { :f => f } %>
+ url: project_units_path(@project),
+ html: {id: 'unit-form'} do |f| %>
+ <%= render partial: 'units/form', locals: {f: f} %>
<%= submit_tag l(:button_create) %>
- <%= link_to l(:button_cancel), "#", :onclick => '$("#add-unit").hide()' %>
+ <%= link_to l(:button_cancel), "#", onclick: '$("#add-unit").hide(); return false;' %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index bc792e0..12f2f3f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,13 +3,13 @@
resources :projects do
shallow do
- resources :body_trackers, :only => [:index] do
+ resources :body_trackers, only: [:index] do
post 'defaults', on: :collection
end
- resources :measurements, :only => [:index, :create, :destroy] do
+ resources :measurements, only: [:index, :create, :destroy] do
post 'toggle', on: :member
end
- resources :ingredients, :only => [:index, :create, :destroy] do
+ resources :ingredients, only: [:index, :create, :destroy] do
post 'toggle', on: :member
collection do
get 'nutrients'
@@ -19,8 +19,8 @@ resources :projects do
post 'import'
end
end
- resources :sources, :only => [:index, :create, :destroy]
- resources :quantities, :only => [:index, :create, :edit, :update, :destroy] do
+ resources :sources, only: [:index, :create, :destroy]
+ resources :quantities, only: [:index, :create, :edit, :update, :destroy] do
member do
post 'toggle'
post 'move/:direction', to: 'quantities#move', as: :move
@@ -30,6 +30,6 @@ resources :projects do
get 'filter'
end
end
- resources :units, :only => [:index, :create, :destroy]
+ resources :units, only: [:index, :create, :destroy]
end
end
diff --git a/db/migrate/001_create_schema.rb b/db/migrate/001_create_schema.rb
index 7e280fc..acba558 100644
--- a/db/migrate/001_create_schema.rb
+++ b/db/migrate/001_create_schema.rb
@@ -16,8 +16,8 @@ class CreateSchema < ActiveRecord::Migration
t.boolean :primary
# fields for awesome_nested_set
t.references :parent
- t.integer :lft, :null => false, :index => true
- t.integer :rgt, :null => false, :index => true
+ t.integer :lft, null: false, index: true
+ t.integer :rgt, null: false, index: true
t.timestamps null: false
end
diff --git a/init.rb b/init.rb
index e8a1603..505153c 100644
--- a/init.rb
+++ b/init.rb
@@ -15,23 +15,23 @@ Redmine::Plugin.register :body_tracking do
project_module :body_tracking do
permission :view_body_trackers, {
- :body_trackers => [:index],
- :measurements => [:index],
- :ingredients => [:index, :nutrients, :filter, :filter_nutrients],
- :sources => [:index],
- :quantities => [:index, :parents, :filter],
- :units => [:index],
+ body_trackers: [:index],
+ measurements: [:index],
+ ingredients: [:index, :nutrients, :filter, :filter_nutrients],
+ sources: [:index],
+ quantities: [:index, :parents, :filter],
+ units: [:index],
}, read: true
permission :manage_common, {
- :body_trackers => [:defaults],
- :measurements => [:create, :destroy, :toggle],
- :ingredients => [:create, :destroy, :toggle, :import, :toggle_nutrient_column],
- :sources => [:create, :destroy],
- :quantities => [:create, :edit, :update, :destroy, :toggle, :move],
- :units => [:create, :destroy],
+ body_trackers: [:defaults],
+ measurements: [:create, :destroy, :toggle],
+ ingredients: [:create, :destroy, :toggle, :import, :toggle_nutrient_column],
+ sources: [:create, :destroy],
+ quantities: [:create, :edit, :update, :destroy, :toggle, :move],
+ units: [:create, :destroy],
}, require: :loggedin
end
- menu :project_menu, :body_trackers, {:controller => 'body_trackers', :action => 'index'},
- :caption => :body_trackers_menu_caption, :before => :settings, :param => :project_id
+ menu :project_menu, :body_trackers, {controller: 'body_trackers', action: 'index'},
+ caption: :body_trackers_menu_caption, before: :settings, param: :project_id
end