developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error

This commit is contained in:
chris 2013-03-26 16:16:19 +08:00
parent 8e0331449f
commit 0a01faedc9
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/admin/page_parts_helper.rb
View File

@ -11,11 +11,7 @@ module Admin::PagePartsHelper
def get_widget_field_rel(local_item=nil) def get_widget_field_rel(local_item=nil)
local_item = @part if local_item.nil? && @part local_item = @part if local_item.nil? && @part
<<<<<<< HEAD
local_item = @item if local_item.nil? && @item local_item = @item if local_item.nil? && @item
=======
local_item = @item if local_item.nil? && @page
>>>>>>> 66633443de1c127841eb8ac149d0e3f9095c2f73
case local_item case local_item
when Page 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 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 local_item = @part if local_item.nil? && @part
<<<<<<< HEAD
local_item = @item if local_item.nil? && @item local_item = @item if local_item.nil? && @item
=======
local_item = @item if local_item.nil? && @page
>>>>>>> 66633443de1c127841eb8ac149d0e3f9095c2f73
res = '' res = ''
choosen_value = prefill_value || (local_item[field_name][i][0] rescue nil) 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) def widget_field_options(i,local_item=nil)
local_item = @part if local_item.nil? && @part local_item = @part if local_item.nil? && @part
<<<<<<< HEAD
local_item = @item if local_item.nil? && @item 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| options = @module_app.widget_fields.collect do |widget_field|
label = I18n.t("#{@module_app.key}.default_widget.#{widget_field[0]}") label = I18n.t("#{@module_app.key}.default_widget.#{widget_field[0]}")