Skip to content

Commit

Permalink
Merge pull request ezsystems#1132 from peterkeung/show-missing-histor…
Browse files Browse the repository at this point in the history
…y-status

Fix for EZP-21605: Version history Status column is missing data
  • Loading branch information
yannickroger committed Jan 7, 2015
2 parents 11b57f8 + bac4815 commit a2631bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion design/admin/templates/content/history.tpl
Expand Up @@ -90,7 +90,7 @@
<td><a href={concat( '/content/versionview/', $object.id, '/', $version.version, '/', $initial_language.locale )|ezurl} title="{'View the contents of version #%version_number. Translation: %translation.'|i18n( 'design/admin/content/history',, hash( '%version_number', $version.version, '%translation', $initial_language.name ) )}">{$version.version}</a></td>

{* Status. *}
<td>{$version.status|choose( 'Draft'|i18n( 'design/admin/content/history' ), 'Published'|i18n( 'design/admin/content/history' ), 'Pending'|i18n( 'design/admin/content/history' ), 'Archived'|i18n( 'design/admin/content/history' ), 'Rejected'|i18n( 'design/admin/content/history' ), 'Untouched draft'|i18n( 'design/admin/content/history' ) )}</td>
<td>{$version.status|choose( 'Draft'|i18n( 'design/admin/content/history' ), 'Published'|i18n( 'design/admin/content/history' ), 'Pending'|i18n( 'design/admin/content/history' ), 'Archived'|i18n( 'design/admin/content/history' ), 'Rejected'|i18n( 'design/admin/content/history' ), 'Untouched draft'|i18n( 'design/admin/content/history' ), 'Repeat'|i18n( 'design/standard/content/history' ), 'Queued'|i18n( 'design/standard/content/history' ) )}</td>

{* Modified translation. *}
<td>
Expand Down
2 changes: 1 addition & 1 deletion design/standard/templates/content/history.tpl
Expand Up @@ -83,7 +83,7 @@
<td><a href={concat( '/content/versionview/', $object.id, '/', $version.version, '/', $initial_language.locale )|ezurl} title="{'View the contents of version #%version_number. Translation: %translation.'|i18n( 'design/standard/content/history',, hash( '%version_number', $version.version, '%translation', $initial_language.name ) )}">{$version.version}</a></td>

{* Status. *}
<td>{$version.status|choose( 'Draft'|i18n( 'design/standard/content/history' ), 'Published'|i18n( 'design/standard/content/history' ), 'Pending'|i18n( 'design/standard/content/history' ), 'Archived'|i18n( 'design/standard/content/history' ), 'Rejected'|i18n( 'design/standard/content/history' ), 'Untouched draft'|i18n( 'design/standard/content/history' ) )}</td>
<td>{$version.status|choose( 'Draft'|i18n( 'design/standard/content/history' ), 'Published'|i18n( 'design/standard/content/history' ), 'Pending'|i18n( 'design/standard/content/history' ), 'Archived'|i18n( 'design/standard/content/history' ), 'Rejected'|i18n( 'design/standard/content/history' ), 'Untouched draft'|i18n( 'design/standard/content/history' ), 'Repeat'|i18n( 'design/standard/content/history' ), 'Queued'|i18n( 'design/standard/content/history' ) )}</td>

{* Modified translation. *}
<td>
Expand Down

0 comments on commit a2631bd

Please sign in to comment.