File 0007-Fix-acl_enabled-bsc-1069296.patch of Package hawk2.8901

From 9a40e0c08d101121fc8ce1722b9368c6917cbc1a Mon Sep 17 00:00:00 2001
From: ayoub-belarbi <belarbi.ayoub@gmail.com>
Date: Fri, 1 Dec 2017 15:29:11 +0100
Subject: [PATCH 16/27] Dev: Fix acl_enabled? (bsc#1069296)

---
 hawk/app/controllers/users_controller.rb | 2 +-
 hawk/lib/util.rb                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hawk/app/controllers/users_controller.rb b/hawk/app/controllers/users_controller.rb
index 9293f310..c9cab1e8 100644
--- a/hawk/app/controllers/users_controller.rb
+++ b/hawk/app/controllers/users_controller.rb
@@ -157,7 +157,7 @@ class UsersController < ApplicationController
 
   def check_support
     flash.now[:warning] = view_context.link_to(
-      _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration ('Manage > Configuration')"),
+      _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration ('Configuration > Cluster Configuration')"),
       edit_cib_crm_config_path(cib_id: @cib.id)
     ) unless Util.acl_enabled?
   end
diff --git a/hawk/lib/util.rb b/hawk/lib/util.rb
index 6fb840d9..ed4ea6b4 100644
--- a/hawk/lib/util.rb
+++ b/hawk/lib/util.rb
@@ -335,9 +335,9 @@ module Util
       '-t', '5',
       '-Ql',
       '--xpath',
-      '//configuration//crm_config//nvpair[@name=\'enable-acl\' and @value=\'true\']'.shellescape
+      %Q[//configuration//crm_config//nvpair[@name='enable-acl' and @value='true']] # %Q acts like a double quoted string
     ).chomp.present?
-  end
+    end
   module_function :acl_enabled?
 
   def acl_version
-- 
2.16.4

openSUSE Build Service is sponsored by