4 files changed, 23 insertions, 11 deletions
diff --git a/app/controllers/gateway_settings_controller.rb b/app/controllers/gateway_settings_controller.rb
index 04af795..5d9f7e5 100644
--- a/app/controllers/gateway_settings_controller.rb
+++ b/app/controllers/gateway_settings_controller.rb
@@ -3,6 +3,7 @@ class GatewaySettingsController < ApplicationController
   load_and_authorize_resource :gateway_setting, :through => [:gateway]
 
   def index
+    @gateway_settings = @gateway.gateway_settings
   end
 
   def show
@@ -13,30 +14,30 @@ class GatewaySettingsController < ApplicationController
   end
 
   def create
-    @gateway_setting = GatewaySetting.new(params[:gateway_setting])
+    @gateway_setting = @gateway.gateway_settings.build(params[:gateway_setting])
     if @gateway_setting.save
-      redirect_to @gateway_setting, :notice => t('gateway_settings.controller.successfuly_created')
+      redirect_to [@gateway, @gateway_setting], :notice => t('gateway_settings.controller.successfuly_created')
     else
       render :new
     end
   end
 
   def edit
-    @gateway_setting = GatewaySetting.find(params[:id])
+    @gateway_setting = @gateway.gateway_settings.find(params[:id])
   end
 
   def update
-    @gateway_setting = GatewaySetting.find(params[:id])
+    @gateway_setting = @gateway.gateway_settings.find(params[:id])
     if @gateway_setting.update_attributes(params[:gateway_setting])
-      redirect_to @gateway_setting, :notice  => t('gateway_settings.controller.successfuly_updated')
+      redirect_to [@gateway, @gateway_setting], :notice  => t('gateway_settings.controller.successfuly_updated')
     else
       render :edit
     end
   end
 
   def destroy
-    @gateway_setting = GatewaySetting.find(params[:id])
+    @gateway_setting = @gateway.gateway_settings.find(params[:id])
     @gateway_setting.destroy
-    redirect_to gateway_settings_url, :notice => t('gateway_settings.controller.successfuly_destroyed')
+    redirect_to gateway_gateway_settings_path(@gateway), :notice => t('gateway_settings.controller.successfuly_destroyed')
   end
 end
diff --git a/app/models/gateway.rb b/app/models/gateway.rb
index 72cf72c..d879fe9 100644
--- a/app/models/gateway.rb
+++ b/app/models/gateway.rb
@@ -14,4 +14,15 @@ class Gateway < ActiveRecord::Base
             :presence => true,
             :inclusion => { :in => TECHNOLOGIES }
 
+  before_validation :downcase_technology
+
+  def to_s
+    name
+  end
+
+  private
+  def downcase_technology
+    technology = technology.downcase
+  end
+
 end
diff --git a/app/views/gateway_settings/_index_core.html.haml b/app/views/gateway_settings/_index_core.html.haml
index 1b8e443..5b93f16 100644
--- a/app/views/gateway_settings/_index_core.html.haml
+++ b/app/views/gateway_settings/_index_core.html.haml
@@ -9,9 +9,9 @@
   - reset_cycle
   - for gateway_setting in gateway_settings
     %tr{:class => cycle('odd', 'even')}
-      %td= gateway_setting.gateway_id
+      %td= gateway_setting.gateway
       %td= gateway_setting.name
       %td= gateway_setting.value
       %td= gateway_setting.class_type
       %td= gateway_setting.description
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gateway_setting}
-\ No newline at end of file
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => gateway_setting.gateway, :child_class => gateway_setting}
+\ No newline at end of file
diff --git a/app/views/gateway_settings/show.html.haml b/app/views/gateway_settings/show.html.haml
index 4f38e0b..14de6de 100644
--- a/app/views/gateway_settings/show.html.haml
+++ b/app/views/gateway_settings/show.html.haml
@@ -2,7 +2,7 @@
 
 %p
   %strong= t('gateway_settings.show.gateway_id') + ":"
-  = @gateway_setting.gateway_id
+  = @gateway_setting.gateway
 %p
   %strong= t('gateway_settings.show.name') + ":"
   = @gateway_setting.name
@@ -16,4 +16,4 @@
   %strong= t('gateway_settings.show.description') + ":"
   = @gateway_setting.description
 
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @gateway_setting }
-\ No newline at end of file
+= render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @gateway_setting.gateway, :child_class => @gateway_setting}
+\ No newline at end of file