From d70b64299df07efc0655f093ec10d8b166bbaaa8 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 1 Jul 2014 14:36:15 +0800 Subject: [PATCH] changed widget title.. now from database --- app/controllers/pages_controller.rb | 1 + app/helpers/orbit_helper.rb | 8 ++++++++ app/helpers/pages_helper.rb | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 3ef65ca..77ff834 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -228,6 +228,7 @@ class PagesController < ApplicationController OrbitHelper.set_widget_categories subpart.categories OrbitHelper.set_widget_module_app subpart.module OrbitHelper.set_widget_item_url subpart + OrbitHelper.set_widget_title subpart.title custom_value = subpart.custom_string_field || subpart.custom_array_field rescue nil if !custom_value.nil? OrbitHelper.set_widget_custom_value custom_value diff --git a/app/helpers/orbit_helper.rb b/app/helpers/orbit_helper.rb index ca27bd8..9eff2db 100644 --- a/app/helpers/orbit_helper.rb +++ b/app/helpers/orbit_helper.rb @@ -54,6 +54,14 @@ module OrbitHelper @widget_module_app = ModuleApp.where(:key=>module_app).first end + def self.set_widget_title(title) + @widget_title = title + end + + def self.widget_title + @widget_title + end + def self.params @params end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb index b40044e..a72e942 100644 --- a/app/helpers/pages_helper.rb +++ b/app/helpers/pages_helper.rb @@ -71,7 +71,9 @@ module PagesHelper html = html.gsub(h,htmls[1][i]) end if keys[1] - (data[keys[1]].kind_of?(Array) ? data[keys[0]] : data[keys[1]]).each do |key,value| + extras = (data[keys[1]].kind_of?(Array) ? data[keys[0]] : data[keys[1]]) + extras["widget-title"] = OrbitHelper.widget_title + extras.each do |key,value| html = html.gsub("{{#{key}}}",value.to_s.html_safe) html = html.gsub("%7B%7B#{key}%7D%7D",value.to_s) end