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.

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

Display Catalog Item form buttons #432

Conversation

jzigmund
Copy link

@jzigmund
Copy link
Author

@miq-bot add_label ui,bug

@miq-bot
Copy link
Member

miq-bot commented Feb 20, 2017

Checked commit jzigmund@19279f5 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
1 file checked, 0 offenses detected
Everything looks good. 🍰

@h-kataria
Copy link
Contributor

looks good

@h-kataria h-kataria added this to the Sprint 55 Ending Feb 27, 2017 milestone Feb 20, 2017
@h-kataria h-kataria merged commit 269ba6b into ManageIQ:master Feb 20, 2017
@simaishi
Copy link
Contributor

simaishi commented Mar 7, 2017

@jzigmund Please resolve conflict and make Euwe-specific PR (referencing this one) or suggest other PRs to backport.

$ git diff
diff --cc app/controllers/application_controller/buttons.rb
index 10984b3,8d0a351..0000000
--- a/app/controllers/application_controller/buttons.rb
+++ b/app/controllers/application_controller/buttons.rb
@@@ -590,7 -590,7 +590,11 @@@ module ApplicationController::Button
      @layout = "miq_ae_automate_button"
      @sb[:button_groups] = nil
      @sb[:buttons] = nil
++<<<<<<< HEAD
 +    replace_right_cell("group_edit")
++=======
+     replace_right_cell(:action => "group_edit")
++>>>>>>> 269ba6b... Merge pull request #432 from jzigmund/bz1421829-catalog_item-missing_form_buttons
    end
  
    def button_new_edit(typ)
@@@ -611,7 -611,7 +615,11 @@@
      @layout = "miq_ae_automate_button"
      @sb[:buttons] = nil
      @sb[:button_groups] = nil
++<<<<<<< HEAD
 +    replace_right_cell("button_edit")
++=======
+     replace_right_cell(:action => "button_edit")
++>>>>>>> 269ba6b... Merge pull request #432 from jzigmund/bz1421829-catalog_item-missing_form_buttons
    end
  
    # Set form variables for button add/edit

@jzigmund
Copy link
Author

@simaishi Hi, no need to cherry-pick/backport the change. The Catalog Item form buttons appears properly on Euwe branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants