Merge branch 'fix_service_controllere' into '5.11.z'

Fix method show in service controller

See merge request cloudforms/cfme-ui-classic!127

(cherry picked from commit 43e6e74)
(cherry picked from commit f71880c)

app/controllers/service_controller.rb

@@ -46,6 +46,8 @@ def title
 
   # Service show selected, redirect to proper controller
   def show
+    assert_privileges('service_view')
+
     @record = Service.find(params[:id].to_i)
     @lastaction = "show"
 
@@ -204,11 +206,6 @@ def reconfigure_form_fields
     super
   end
 
-  def show
-    assert_privileges('service_view')
-    super
-  end
-
   private
 
   def record_class