Skip to content

Commit

Permalink
Merge pull request #2825 from zeari/rename_phase_status
Browse files Browse the repository at this point in the history
Rename 'phase' to 'status' for container groups summary page
(cherry picked from commit 34d8502)

https://bugzilla.redhat.com/show_bug.cgi?id=1517947
  • Loading branch information
mzazrivec authored and simaishi committed Nov 27, 2017
1 parent a489c4c commit 81b907c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/helpers/container_group_helper/textual_summary.rb
Expand Up @@ -6,7 +6,7 @@ module ContainerGroupHelper::TextualSummary
def textual_group_properties
TextualGroup.new(
_("Properties"),
%i(name phase message reason creation_timestamp resource_version restart_policy dns_policy ip)
%i(name status message reason creation_timestamp resource_version restart_policy dns_policy ip)
)
end

Expand Down Expand Up @@ -78,7 +78,7 @@ def textual_group_volumes
# Items
#

def textual_phase
def textual_status
@record.phase
end

Expand Down
2 changes: 1 addition & 1 deletion app/views/container_project/_show_dashboard.html.haml
Expand Up @@ -86,7 +86,7 @@
%thead
%tr
%th Name
%th Phase
%th Status
%th Ready Status
%th Running Containers
%tr{"ng-repeat" => "pod in pods"}
Expand Down

0 comments on commit 81b907c

Please sign in to comment.