From 0a01faedc925970addaaa599c8cd286af7d64d35 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 26 Mar 2013 16:16:19 +0800 Subject: [PATCH] Fix merge error --- app/helpers/admin/page_parts_helper.rb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/helpers/admin/page_parts_helper.rb b/app/helpers/admin/page_parts_helper.rb index ef85a724a..601da3cd8 100644 --- a/app/helpers/admin/page_parts_helper.rb +++ b/app/helpers/admin/page_parts_helper.rb @@ -11,11 +11,7 @@ module Admin::PagePartsHelper def get_widget_field_rel(local_item=nil) local_item = @part if local_item.nil? && @part -<<<<<<< HEAD local_item = @item if local_item.nil? && @item -======= - local_item = @item if local_item.nil? && @page ->>>>>>> 66633443de1c127841eb8ac149d0e3f9095c2f73 case local_item when Page @@ -27,11 +23,7 @@ module Admin::PagePartsHelper def link_to_field_switch(i,object_name,field_name,local_item=nil,prefill_value=nil) #link_to_field is for showing local_item = @part if local_item.nil? && @part -<<<<<<< HEAD local_item = @item if local_item.nil? && @item -======= - local_item = @item if local_item.nil? && @page ->>>>>>> 66633443de1c127841eb8ac149d0e3f9095c2f73 res = '' choosen_value = prefill_value || (local_item[field_name][i][0] rescue nil) @@ -61,11 +53,7 @@ module Admin::PagePartsHelper def widget_field_options(i,local_item=nil) local_item = @part if local_item.nil? && @part -<<<<<<< HEAD local_item = @item if local_item.nil? && @item -======= - local_item = @item if local_item.nil? && @page ->>>>>>> 66633443de1c127841eb8ac149d0e3f9095c2f73 options = @module_app.widget_fields.collect do |widget_field| label = I18n.t("#{@module_app.key}.default_widget.#{widget_field[0]}")