Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GO cleanup #2635

Merged
merged 8 commits into from
Nov 6, 2017
Merged

GO cleanup #2635

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af249e3
GO: pass node explicitly.
martinpovolny Nov 6, 2017
6c563a8
GO: remove dead code.
martinpovolny Nov 6, 2017
b4d454e
GO: fix style for hashes.
martinpovolny Nov 6, 2017
4f06299
GO: replace node type predicates with a single method.
martinpovolny Nov 6, 2017
74e91e1
GO: remove an always true condition.
martinpovolny Nov 6, 2017
d0b97a6
GO: Remove a statement with no effect.
martinpovolny Nov 6, 2017
a181860
Go: there is no :searchbox in the page.
martinpovolny Nov 6, 2017
7e515c6
GO: simplify node_info data flow adding a formal argument.
martinpovolny Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 39 additions & 53 deletions app/controllers/generic_object_definition_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def show_list
super
self.x_active_tree ||= :generic_object_definitions_tree
self.x_node ||= 'root'
node_info
node_info(x_node)
end

def show
Expand All @@ -42,13 +42,13 @@ def button
javascript_redirect(
case params[:pressed]
when 'generic_object_definition_new'
{ :action => 'new' }
{:action => 'new'}
when 'generic_object_definition_edit'
{ :action => 'edit', :id => from_cid(params[:id] || params[:miq_grid_checks]) }
{:action => 'edit', :id => from_cid(params[:id] || params[:miq_grid_checks])}
when 'ab_group_new'
{ :action => 'custom_button_group_new', :id => from_cid(params[:id] || params[:miq_grid_checks]) }
{:action => 'custom_button_group_new', :id => from_cid(params[:id] || params[:miq_grid_checks])}
when 'ab_group_edit'
{ :action => 'custom_button_group_edit', :id => from_cid(params[:id]) }
{:action => 'custom_button_group_edit', :id => from_cid(params[:id])}
end
)
end
Expand Down Expand Up @@ -94,60 +94,44 @@ def custom_button_group_edit

private

def root_node?
node = x_node || params[:id]
node == 'root'
end

def god_node?
node = x_node || params[:id]
node.split('-').first == 'god'
end

def custom_button_group_node?
node = x_node || params[:id]
node.split('-').first == 'cbg'
end

def actions_node?
node = x_node || params[:id]
node.split('-').first == 'xx'
end

def retrieve_node_type
node = x_node || params[:id]
return 'root' if node == 'root'
node.split('-').first
def node_type(node)
node_prefix = node.split('-').first
case node_prefix
when 'root' then :root
when 'god' then :god
when 'cbg' then :button_group
when 'xx' then :actions
else raise 'Invalid node type.'
end
end

def node_info
root_node_info if root_node?
god_node_info if god_node?
actions_node_info if actions_node?
custom_button_group_node_info if custom_button_group_node?
def node_info(node)
case node_type(node)
when :root then root_node_info
when :god then god_node_info(node)
when :actions then actions_node_info(node)
when :button_group then custom_button_group_node_info(node)
end
end

def root_node_info
@root_node = true
@right_cell_text = _("All %{models}") % {:models => _("Generic Object Classes")}
end

def god_node_info
node = x_node || params[:id]
def god_node_info(node)
@god_node = true
@record = GenericObjectDefinition.find(from_cid(node.split('-').last))
@right_cell_text = _("Generic Object Class %{record_name}") % {:record_name => @record.name}
end

def actions_node_info
node = x_node || params[:id]
def actions_node_info(node)
@actions_node = true
@record = GenericObjectDefinition.find(from_cid(node.split('-').last))
@right_cell_text = _("Actions for %{model}") % {:model => _("Generic Object Class")}
end

def custom_button_group_node_info
node = x_node || params[:id]
def custom_button_group_node_info(node)
@custom_button_group_node = true
@record = CustomButtonSet.find(from_cid(node.split("-").last))
@right_cell_text = _("Custom Button Set %{record_name}") % {:record_name => @record.name}
Expand All @@ -173,22 +157,22 @@ def process_root_node(presenter)
build_toolbar("x_gtl_view_tb")
end

def process_god_node(presenter)
god_node_info
def process_god_node(presenter, node)
god_node_info(node)
presenter.replace(:main_div, r[:partial => 'show_god'])
presenter.hide(:paging_div)
build_toolbar("x_summary_view_tb")
end

def process_actions_node(presenter)
actions_node_info
def process_actions_node(presenter, node)
actions_node_info(node)
presenter.replace(:main_div, r[:partial => 'show_actions'])
presenter.hide(:paging_div)
build_toolbar("x_summary_view_tb")
end

def process_custom_button_group_node(presenter)
custom_button_group_node_info
def process_custom_button_group_node(presenter, node)
custom_button_group_node_info(node)
presenter.replace(:main_div, r[:partial => 'show_custom_button_group'])
presenter.hide(:paging_div)
build_toolbar("x_summary_view_tb")
Expand All @@ -198,21 +182,23 @@ def replace_right_cell
presenter = ExplorerPresenter.new(:active_tree => x_active_tree)
@explorer = false

v_tb = process_root_node(presenter) if root_node?
v_tb = process_god_node(presenter) if god_node?
v_tb = process_custom_button_group_node(presenter) if custom_button_group_node?
v_tb = process_actions_node(presenter) if actions_node?
node = x_node || params[:id]

v_tb = case node_type(node)
when :root then process_root_node(presenter)
when :god then process_god_node(presenter, node)
when :actions then process_actions_node(presenter, node)
when :button_group then process_custom_button_group_node(presenter, node)
end

c_tb = build_toolbar(center_toolbar_filename)
h_tb = build_toolbar("x_history_tb")

presenter.reload_toolbars(:history => h_tb, :center => c_tb, :view => v_tb)
presenter.set_visibility(h_tb.present? || c_tb.present? || v_tb.present?, :toolbar)
presenter.set_visibility(!(@record || @in_a_form), :searchbox)
presenter.set_visibility(true, :toolbar)

presenter[:osf_node] = x_node
presenter[:record_id] = @record.try(:id)
presenter[:activate_node] = x_active_tree.to_s
presenter[:right_cell_text] = @right_cell_text

render :json => presenter.for_render
Expand Down