mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Util::formatDate() expect $timestamp as double

This commit is contained in:
Bjoern Schiessle 2012-06-27 15:05:40 +02:00
parent 2d8a380a21
commit d5237c42bc
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_versions/ajax/getVersions.php
View File

@ -14,9 +14,7 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
$versionsFormatted = array(); $versionsFormatted = array();
foreach ( $versions AS $version ) { foreach ( $versions AS $version ) {
$versionsFormatted[] = OCP\Util::formatDate( doubleval($version) );
$versionsFormatted[] = OCP\Util::formatDate( $version );
} }
$versionsSorted = array_reverse( $versions ); $versionsSorted = array_reverse( $versions );

4
apps/files_versions/history.php
View File

@ -38,13 +38,13 @@ if ( isset( $_GET['path'] ) ) {
$tmpl->assign( 'outcome_stat', 'success' ); $tmpl->assign( 'outcome_stat', 'success' );
$tmpl->assign( 'outcome_msg', "File {$_GET['path']} was reverted to version ".OCP\Util::formatDate( $_GET['revert'] ) ); $tmpl->assign( 'outcome_msg', "File {$_GET['path']} was reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
} else { } else {
$tmpl->assign( 'outcome_stat', 'failure' ); $tmpl->assign( 'outcome_stat', 'failure' );
$tmpl->assign( 'outcome_msg', "File {$_GET['path']} could not be reverted to version ".OCP\Util::formatDate( $_GET['revert'] ) ); $tmpl->assign( 'outcome_msg', "File {$_GET['path']} could not be reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
} }

4
apps/files_versions/js/versions.js
View File

@ -104,9 +104,9 @@ function createVersionsDropdown(filename, files) {
} }
function addVersion(revision ) { function addVersion(revision ) {
name=formatDate(revision*1000); name=formatDate(revision.version*1000);
var version=$('<option/>'); var version=$('<option/>');
version.attr('value',revision); version.attr('value',revision.version);
version.text(name); version.text(name);
// } else { // } else {

4
apps/files_versions/templates/history.php
View File

@ -20,13 +20,11 @@ if( isset( $_['message'] ) ) {
echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />'); echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />');
foreach ( $_['versions'] as $v ) { foreach ( $_['versions'] as $v ) {
echo ' '; echo ' ';
echo OCP\Util::formatDate( $v['version'] ); echo OCP\Util::formatDate( doubleval($v['version']) );
echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a><br /><br />'; echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a><br /><br />';
if ( $v['cur'] ) { echo ' (<b>Current</b>)'; } if ( $v['cur'] ) { echo ' (<b>Current</b>)'; }
echo '<br /><br />'; echo '<br /><br />';
} }
} }