diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb index afff1c2..82facaf 100644 --- a/app/controllers/measurements_controller.rb +++ b/app/controllers/measurements_controller.rb @@ -16,7 +16,7 @@ class MeasurementsController < ApplicationController def create @measurement = @project.measurements.new(measurement_params) if @measurement.save - flash[:notice] = 'Created newmeasurement' + flash[:notice] = 'Created new measurement' redirect_to :back else prepare_measurements @@ -41,7 +41,7 @@ class MeasurementsController < ApplicationController private - def ingredient_params + def measurement_params params.require(:measurement).permit( :name, :source_id, diff --git a/app/models/readout.rb b/app/models/readout.rb index b9ae2eb..506ba5e 100644 --- a/app/models/readout.rb +++ b/app/models/readout.rb @@ -3,5 +3,5 @@ class Readout < ActiveRecord::Base belongs_to :quantity, required: true belongs_to :unit, required: true - validates :quantity, uniqueness: {scope: [:ingredient_id, :unit_id]} + validates :quantity, uniqueness: {scope: [:measurement_id, :unit_id]} end diff --git a/app/views/measurements/_list.html.erb b/app/views/measurements/_index.html.erb similarity index 100% rename from app/views/measurements/_list.html.erb rename to app/views/measurements/_index.html.erb diff --git a/app/views/measurements/create.html.erb b/app/views/measurements/create.html.erb deleted file mode 100644 index 70aa6cd..0000000 --- a/app/views/measurements/create.html.erb +++ /dev/null @@ -1 +0,0 @@ -