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

Add configuration_scripts to the list of trees with advanced search #12704

Conversation

lgalis
Copy link
Contributor

@lgalis lgalis commented Nov 17, 2016

Add configuration_scripts to the list of trees with advanced search

Links

Euwe PR:
#12717

https://bugzilla.redhat.com/show_bug.cgi?id=1395744

Steps for Testing/QA

  1. Add Tower provider, navigate to Ansible Tower Jobs
  2. Navigate to Compute -> Cloud -> Providers
  3. Navigate back to Ansible Tower Jobs

@lgalis
Copy link
Contributor Author

lgalis commented Nov 17, 2016

@miq-bot add_label wip, ui, bug

@lgalis lgalis closed this Nov 17, 2016
@lgalis lgalis reopened this Nov 17, 2016
@lgalis lgalis force-pushed the advanced_search_for_ansible_job_templates_not_displayed branch from 3ac06f1 to 942625b Compare November 17, 2016 16:14
@lgalis lgalis changed the title [WIP] Add configuration_scripts to the list of trees with advanced search Add configuration_scripts to the list of trees with advanced search Nov 17, 2016
@lgalis lgalis force-pushed the advanced_search_for_ansible_job_templates_not_displayed branch from 942625b to 025652b Compare November 17, 2016 16:45
@lgalis
Copy link
Contributor Author

lgalis commented Nov 17, 2016

@miq-bot remove_label wip

@miq-bot miq-bot removed the wip label Nov 17, 2016
@miq-bot
Copy link
Member

miq-bot commented Nov 17, 2016

Checked commits lgalis/manageiq@8344072~...025652b with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
2 files checked, 0 offenses detected
Everything looks good. 🍰

@dclarizio dclarizio self-assigned this Nov 18, 2016
@dclarizio dclarizio merged commit 2037d28 into ManageIQ:master Nov 18, 2016
@dclarizio dclarizio added this to the Sprint 50 Ending Dec 5, 2016 milestone Nov 18, 2016
@lgalis lgalis deleted the advanced_search_for_ansible_job_templates_not_displayed branch November 18, 2016 15:49
@simaishi
Copy link
Contributor

simaishi commented Jan 9, 2017

Euwe backport conflict:

$ git cherry-pick -e -x -m 1 2037d28
error: could not apply 2037d28... Merge pull request #12704 from lgalis/advanced_search_for_ansible_job_templates_not_displayed
$ git diff
diff --cc app/helpers/application_helper.rb
index e06c2eb,ef24f3b..0000000
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@@ -1363,31 -1548,24 +1363,51 @@@ module ApplicationHelpe
      end
    end
  
 +  def skip_days_from_time_profile(time_profile_days)
 +    (1..7).to_a.delete_if do |d|
 +      # time_profile_days has 0 for sunday, skip_days needs 7 for sunday
 +      time_profile_days.include?(d % 7)
 +    end
 +  end
 +
 +  def breadcrumb_prohibited_for_action?
 +    !%w(accordion_select explorer tree_select).include?(action_name)
 +  end
 +
 +  delegate :id, :to => :my_server, :prefix => true
 +
 +  def my_zone_name
 +    my_server.my_zone
 +  end
 +
 +  def my_server
 +    @my_server ||= MiqServer.my_server(true)
 +  end
 +
    def tree_with_advanced_search?
++<<<<<<< HEAD
 +    %i(containers images cs_filter foreman_providers instances providers vandt
 +     images_filter instances_filter templates_filter templates_images_filter containers_filter
 +     vms_filter vms_instances_filter storage).include?(x_tree[:type])
++=======
+     %i(containers
+        containers_filter
+        cs_filter
+        configuration_scripts
+        foreman_providers
+        images
+        images_filter
+        instances
+        instances_filter
+        providers
+        storage
+        templates_filter
+        templates_images_filter
+        vandt
+        vms_filter
+        vms_instances_filter
+       ).include?(x_tree[:type])
++>>>>>>> 2037d28... Merge pull request #12704 from lgalis/advanced_search_for_ansible_job_templates_not_displayed
    end
  
    def show_advanced_search?

@simaishi
Copy link
Contributor

simaishi commented Jan 9, 2017

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

@simaishi
Copy link
Contributor

simaishi commented Jan 9, 2017

Backported to Euwe via #12717

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.

6 participants