Merge 05e3a26 into 0d77a3d

hpi-swt2 · Mar 26, 2019 · 1e69b4e · 1e69b4e
2 parents 0d77a3d + 05e3a26
commit 1e69b4e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 57 deletions.
diff --git a/app/controllers/app_settings_controller.rb b/app/controllers/app_settings_controller.rb
@@ -8,16 +8,11 @@ class AppSettingsController < ApplicationController
   def edit; end
 
   # PATCH/PUT /app_settings/1
-  # PATCH/PUT /app_settings/1.json
   def update
-    respond_to do |format|
-      if @app_setting.update(app_setting_params)
-        format.html { redirect_to edit_app_setting_path(@app_setting), notice: 'HART Settings were successfully updated.' }
-        format.json { render :edit, status: :ok, location: @app_setting }
-      else
-        format.html { render :edit }
-        format.json { render json: @app_setting.errors, status: :unprocessable_entity }
-      end
+    if @app_setting.update(app_setting_params)
+      redirect_to edit_app_setting_path(@app_setting), notice: 'HART Settings were successfully updated.'
+    else
+      render :edit
     end
   end
 

diff --git a/app/controllers/operating_systems_controller.rb b/app/controllers/operating_systems_controller.rb
@@ -5,7 +5,6 @@ class OperatingSystemsController < ApplicationController
   before_action :authenticate_admin
 
   # GET /operating_systems
-  # GET /operating_systems.json
   def index
     @operating_systems = OperatingSystem.all
   end
@@ -19,39 +18,28 @@ def new
   def edit; end
 
   # POST /operating_systems
-  # POST /operating_systems.json
   def create
     @operating_system = OperatingSystem.new(operating_system_params)
-
-    respond_to do |format|
-      if @operating_system.save
-        format.html { redirect_to operating_systems_url, notice: 'Operating system was successfully created.' }
-      else
-        format.html { render :new }
-      end
+    if @operating_system.save
+      redirect_to operating_systems_url, notice: 'Operating system was successfully created.'
+    else
+      render :new
     end
   end
 
   # PATCH/PUT /operating_systems/1
-  # PATCH/PUT /operating_systems/1.json
   def update
-    respond_to do |format|
-      if @operating_system.update(operating_system_params)
-        format.html { redirect_to operating_systems_url, notice: 'Operating system was successfully updated.' }
-      else
-        format.html { render :edit }
-      end
+    if @operating_system.update(operating_system_params)
+      redirect_to operating_systems_url, notice: 'Operating system was successfully updated.'
+    else
+      render :edit
     end
   end
 
   # DELETE /operating_systems/1
-  # DELETE /operating_systems/1.json
   def destroy
     @operating_system.destroy
-    respond_to do |format|
-      format.html { redirect_to operating_systems_url, notice: 'Operating system was successfully destroyed.' }
-      format.json { head :no_content }
-    end
+    redirect_to operating_systems_url, notice: 'Operating system was successfully destroyed.'
   end
 
   private

diff --git a/app/controllers/request_templates_controller.rb b/app/controllers/request_templates_controller.rb
@@ -5,7 +5,6 @@ class RequestTemplatesController < ApplicationController
   before_action :authenticate_admin
 
   # GET /request_templates
-  # GET /request_templates.json
   def index
     @request_templates = RequestTemplate.all
   end
@@ -19,49 +18,32 @@ def new
   def edit; end
 
   # POST /request_templates
-  # POST /request_templates.json
   def create
     @request_template = RequestTemplate.new(request_template_params)
-
-    respond_to do |format|
-      if @request_template.save
-        respond format, 'Request template was successfully created.'
-      else
-        format.html { render :new }
-        format.json { render json: @request_template.errors, status: :unprocessable_entity }
-      end
+    if @request_template.save
+      redirect_to request_templates_path, notice: 'Request template was successfully created.'
+    else
+      render :new
     end
   end
 
   # PATCH/PUT /request_templates/1
-  # PATCH/PUT /request_templates/1.json
   def update
-    respond_to do |format|
-      if @request_template.update(request_template_params)
-        respond format, 'Request template was successfully updated.'
-      else
-        format.html { render :edit }
-        format.json { render json: @request_template.errors, status: :unprocessable_entity }
-      end
+    if @request_template.update(request_template_params)
+      redirect_to request_templates_path, notice:'Request template was successfully updated.'
+    else
+      render :edit
     end
   end
 
   # DELETE /request_templates/1
-  # DELETE /request_templates/1.json
   def destroy
     @request_template.destroy
-    respond_to do |format|
-      respond format, 'Request template was successfully destroyed.'
-    end
+    redirect_to request_templates_path, notice: 'Request template was successfully destroyed.'
   end
 
   private
 
-  def respond(format, notice)
-    format.html { redirect_to request_templates_path, notice: notice }
-    format.json { head :no_content }
-  end
-
   # Use callbacks to share common setup or constraints between actions.
   def set_request_template
     @request_template = RequestTemplate.find(params[:id])