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

Jump to bottom

Timelines title #6156

Merged
merged 1 commit into from Sep 9, 2019
Merged

Timelines title #6156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/mixins/more_show_actions.rb
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ def show_timeline
@lastaction = "show_timeline"
@timeline = @timeline_filter = true
tl_build_timeline # Create the timeline report
drop_breadcrumb(:name => _("Timelines"),
drop_breadcrumb(:name => _("Timelines for %{table} \"%{name}\"") % {:table => ui_lookup(:table => controller_name), :name => @record.name},
:url => "/#{controller_name}/show/#{@record.id}" \
"?refresh=n&display=timeline")
end
Expand Down
2 changes: 2 additions & 0 deletions app/views/layouts/_tl_show.html.haml
View file
Open in desktop
Expand Up @@ -3,6 +3,8 @@
ManageIQ.calendar.calDateFrom = new Date(#{@tl_options.date.start});
ManageIQ.calendar.calDateTo = new Date(#{@tl_options.date.end});

%h1
= @title
= render :partial => "layouts/flash_msg"
= render :partial => "layouts/tl_options"
= render :partial => 'layouts/tl_detail'
Expand Down
5 changes: 5 additions & 0 deletions spec/controllers/ems_infra_controller_spec.rb
View file
Open in desktop
Expand Up @@ -325,6 +325,11 @@
expect(ApplicationHelper::Toolbar::TimelineCenter).to receive(:definition).and_call_original
subject
end

it "contains timelines title" do
subject
expect(response.body).to include("Timelines for #{ui_lookup(:table => controller.controller_name)} "#{@ems.name}"")
end
end

context "render listnav partial" do
Expand Down