Last changes on Redmine 4.0
This commit is contained in:
@@ -40,15 +40,6 @@ module Concerns::Finders
|
||||
render_404
|
||||
end
|
||||
|
||||
def find_measurement
|
||||
@measurement = Measurement.find(params[:id])
|
||||
# DON'T set @routine here: @routine is a context for :readouts view (set
|
||||
# elsewhere), not a # @measurement.routine
|
||||
@project = @measurement.routine.project
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
render_404
|
||||
end
|
||||
|
||||
def find_measurement_routine(id = params[:id])
|
||||
@routine = MeasurementRoutine.find(id)
|
||||
@project = @routine.project
|
||||
@@ -60,6 +51,17 @@ module Concerns::Finders
|
||||
find_measurement_routine(params[:measurement_routine_id])
|
||||
end
|
||||
|
||||
def find_measurement(id = params[:id])
|
||||
@measurement = Measurement.find(id)
|
||||
@project = @measurement.routine.project
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
render_404
|
||||
end
|
||||
|
||||
def find_measurement_by_measurement_id
|
||||
find_measurement(params[:measurement_id])
|
||||
end
|
||||
|
||||
def find_quantity(id = params[:id])
|
||||
@quantity = Quantity.find(id)
|
||||
@project = @quantity.project
|
||||
|
||||
Reference in New Issue
Block a user