diff --git a/app/controllers/vehicles_controller.rb b/app/controllers/vehicles_controller.rb index dfdd0a4..a12b088 100644 --- a/app/controllers/vehicles_controller.rb +++ b/app/controllers/vehicles_controller.rb @@ -25,6 +25,7 @@ class VehiclesController < ApplicationController begin @vehicles = Customer.find_by_id(params[:customer_id]).vehicles.paginate(page: params[:page]) rescue ActiveRecord::RecordNotFound + flash[:error] = t :alert_vehicle_not_found render_404 end end @@ -48,7 +49,7 @@ class VehiclesController < ApplicationController def create @vehicle = Vehicle.new(allowed_params) if @vehicle.save - flash[:notice] = "New Vehicle Created" + flash[:notice] = t :notice_vehicle_created redirect_to @vehicle else flash[:error] = @vehicle.errors.full_messages.to_sentence @@ -64,6 +65,7 @@ class VehiclesController < ApplicationController @issues = @vehicle.issues.order(id: :desc) @closed_issues = (@issues - @issues.open) rescue + flash[:error] = t :alert_vehicle_not_found render_404 end end @@ -74,6 +76,7 @@ class VehiclesController < ApplicationController @vehicle = Vehicle.find_by_id(params[:id]) @customer = @vehicle.customer rescue + flash[:error] = t :alert_vehicle_not_found render_404 end end @@ -84,7 +87,7 @@ class VehiclesController < ApplicationController begin @vehicle = Vehicle.find_by_id(params[:id]) if @vehicle.update(allowed_params) - flash[:notice] = "Vehicle updated" + flash[:notice] = t :notice_vehicle_updated redirect_to @vehicle else redirect_to edit_vehicle_path @@ -92,6 +95,7 @@ class VehiclesController < ApplicationController #show any errors anyways flash[:error] = @vehicle.errors.full_messages.to_sentence unless @vehicle.errors.empty? rescue + flash[:error] = t :alert_vehicle_not_updated render_404 end end @@ -100,9 +104,10 @@ class VehiclesController < ApplicationController def destroy begin Vehicle.find_by_id(params[:id]).destroy - flash[:notice] = "Vehicle deleted successfully" + flash[:notice] = t :notice_vehicle_deleted redirect_to action: :index rescue + flash[:error] = t :alert_vehicle_not_deleted render_404 end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 6b5464a..3e8ec6d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -23,4 +23,11 @@ en: label_edit_customer_vehicle: "Edit Customer Vehicle" label_cusomer_vehicles: "Customer Vehicles" label_new_vehicle: "New Customer Vehicle" - button_new_vehice: "New Vehicle" \ No newline at end of file + button_new_vehice: "New Vehicle" + notice_vehicle_created: "Vehicle was successfully created." + notice_vehicle_updated: "Vehicle was successfully updated." + notice_vehicle_deleted: "Vehicle was successfully deleted." + alert_vehicle_not_found: "Vehicle not found." + alert_vehicle_not_deleted: "Vehicle could not be deleted." + alert_vehicle_not_created: "Vehicle could not be created." + alert_vehicle_not_updated: "Vehicle could not be updated." \ No newline at end of file