From 8424cca8043ace581fdf334615304b9a44a1454e Mon Sep 17 00:00:00 2001 From: nimrodshn Date: Mon, 10 Oct 2016 16:22:01 +0300 Subject: [PATCH 1/2] fixed bug 1380683, changed the parsing at miq_policy_controller --- app/controllers/miq_policy_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/miq_policy_controller.rb b/app/controllers/miq_policy_controller.rb index bc91068d52a..2e56247f675 100644 --- a/app/controllers/miq_policy_controller.rb +++ b/app/controllers/miq_policy_controller.rb @@ -634,11 +634,11 @@ def replace_right_cell(nodetype, replace_trees = [], presenter = nil) else if @right_cell_text == @edit _("Editing %{model} Condition \"%{name}\"") % - {:name => @condition.description.gsub(/'/, "\\'"), + {:name => @condition.description.gsub(/'/) {"\'"}, :model => ui_lookup(:model => @edit[:new][:towhat])} else _("%{model} Condition \"%{name}\"") % - {:name => @condition.description.gsub(/'/, "\\'"), + {:name => @condition.description.gsub(/'/) {"\'"}, :model => ui_lookup(:model => @condition.towhat)} end end From d1c3be82096a781797f8c06e4a1cf89f1f804012 Mon Sep 17 00:00:00 2001 From: nimrodshn Date: Mon, 10 Oct 2016 16:59:39 +0300 Subject: [PATCH 2/2] deleted gsub altogether --- app/controllers/miq_policy_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/miq_policy_controller.rb b/app/controllers/miq_policy_controller.rb index 2e56247f675..6da0eaf8d7d 100644 --- a/app/controllers/miq_policy_controller.rb +++ b/app/controllers/miq_policy_controller.rb @@ -634,11 +634,11 @@ def replace_right_cell(nodetype, replace_trees = [], presenter = nil) else if @right_cell_text == @edit _("Editing %{model} Condition \"%{name}\"") % - {:name => @condition.description.gsub(/'/) {"\'"}, + {:name => @condition.description, :model => ui_lookup(:model => @edit[:new][:towhat])} else _("%{model} Condition \"%{name}\"") % - {:name => @condition.description.gsub(/'/) {"\'"}, + {:name => @condition.description, :model => ui_lookup(:model => @condition.towhat)} end end