-
Notifications
You must be signed in to change notification settings - Fork 900
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
Merged
dclarizio
merged 2 commits into
ManageIQ:master
from
lgalis:advanced_search_for_ansible_job_templates_not_displayed
Nov 18, 2016
Merged
Add configuration_scripts to the list of trees with advanced search #12704
dclarizio
merged 2 commits into
ManageIQ:master
from
lgalis:advanced_search_for_ansible_job_templates_not_displayed
Nov 18, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@miq-bot add_label wip, ui, bug |
lgalis
force-pushed
the
advanced_search_for_ansible_job_templates_not_displayed
branch
from
November 17, 2016 16:14
3ac06f1
to
942625b
Compare
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
force-pushed
the
advanced_search_for_ansible_job_templates_not_displayed
branch
from
November 17, 2016 16:45
942625b
to
025652b
Compare
@miq-bot remove_label wip |
Checked commits lgalis/manageiq@8344072~...025652b with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1 |
lgalis
deleted the
advanced_search_for_ansible_job_templates_not_displayed
branch
November 18, 2016 15:49
Euwe backport conflict:
$ 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? |
@lgalis Please resolve conflict and make Euwe-specific PR (referencing this one) or suggest other PRs to backport. |
Backported to Euwe via #12717 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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