Should fix time label bug when creating a document see #4609

skala
Julio Montoya 13 years ago
parent 4cf338211d
commit 8ea76c8374
  1. 7
      main/document/document.php
  2. 2
      main/document/edit_document.php
  3. 6
      main/inc/lib/document.lib.php

@ -994,11 +994,10 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
$row[] = '<span style="display:none;">' . $size . '</span>' . $invisibility_span_open . $display_size . $invisibility_span_close;
// Last edit date
$last_edit_date = $document_data['lastedit_date'];
$last_edit_date = api_get_local_time($last_edit_date, null, date_default_timezone_get());
//$display_date = date_to_str_ago($last_edit_date).'<br /><span class="dropbox_date">'.api_format_date($last_edit_date).'</span>';
$last_edit_date = api_get_local_time($document_data['lastedit_date']);
$display_date = date_to_str_ago($last_edit_date);
$row[] = $invisibility_span_open . $display_date . $invisibility_span_close;
$row[] = $invisibility_span_open.$display_date.$invisibility_span_close;
// Admins get an edit column
if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder(api_get_user_id(), $curdirpath, $session_id)) {

@ -416,7 +416,7 @@ if ($owner_id == api_get_user_id() || api_is_platform_admin() || $is_allowed_to_
$metadata_link = '<a href="../metadata/index.php?eid='.urlencode('Document.'.$document_data['id']).'">'.get_lang('AddMetadata').'</a>';
//Updated on field
$last_edit_date = api_get_local_time($last_edit_date, null, date_default_timezone_get());
$last_edit_date = api_get_local_time($last_edit_date);
$display_date = date_to_str_ago($last_edit_date).' <span class="dropbox_date">'.api_format_date($last_edit_date).'</span>';
$form->addElement('static', null, get_lang('Metadata'), $metadata_link);
$form->addElement('static', null, get_lang('UpdatedOn'), $display_date);

@ -2338,7 +2338,7 @@ class DocumentManager {
* @param int $to_group_id (to calculate group document space)
* @return int total size
*/
function documents_total_space($to_group_id = '0') {
static function documents_total_space($to_group_id = '0') {
$TABLE_ITEMPROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
$TABLE_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
$course_id = api_get_course_int_id();
@ -2365,7 +2365,7 @@ class DocumentManager {
/**
* Here we count 1 kilobyte = 1000 byte, 12 megabyte = 1000 kilobyte.
*/
function display_quota($course_quota, $already_consumed_space) {
static function display_quota($course_quota, $already_consumed_space) {
$course_quota_m = round($course_quota / 1000000);
$already_consumed_space_m = round($already_consumed_space / 1000000);
@ -2416,7 +2416,7 @@ class DocumentManager {
*
* Here we count 1 kilobyte = 1000 byte, 12 megabyte = 1000 kilobyte.
*/
function display_simple_quota($course_quota, $already_consumed_space) {
static function display_simple_quota($course_quota, $already_consumed_space) {
$course_quota_m = round($course_quota / 1000000);
$already_consumed_space_m = round($already_consumed_space / 1000000, 2);
$percentage = $already_consumed_space / $course_quota * 100;

Loading…
Cancel
Save