aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-03-02 13:52:37 +0000
committerplegall <plg@piwigo.org>2012-03-02 13:52:37 +0000
commit7a28277196060df76ef20d8f411c87b645cd2dfb (patch)
tree88a75b2e201249b17a0ae710f63745a962d82ea7 /admin
parent54ce78ca766028a5f7525297b50d38a39372818b (diff)
feature 2555: add original file name on Batch Manager
git-svn-id: http://piwigo.org/svn/trunk@13457 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/batch_manager_global.php8
-rw-r--r--admin/batch_manager_unit.php8
2 files changed, 11 insertions, 5 deletions
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index a7c1a3284..c2a9fdc53 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -758,10 +758,10 @@ SELECT id,path,representative_ext,file,filesize,level,name
$nb_thumbs_page++;
$src = DerivativeImage::thumb_url($row);
- $title = $row['name'];
- if (empty($title))
- {
- $title = get_name_from_file($row['file']);
+ $title = render_element_name($row);
+ if ($title != get_name_from_file($row['file']))
+ {
+ $title.= ' ('.$row['file'].')';
}
$template->append(
diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php
index 24ef9a47c..11d0d6903 100644
--- a/admin/batch_manager_unit.php
+++ b/admin/batch_manager_unit.php
@@ -259,13 +259,19 @@ SELECT
;';
$tag_selection = get_taglist($query);
+ $legend = render_element_name($row);
+ if ($legend != get_name_from_file($row['file']))
+ {
+ $legend.= ' ('.$row['file'].')';
+ }
+
$template->append(
'elements',
array(
'ID' => $row['id'],
'TN_SRC' => $src,
'FILE_SRC' => $row['path'],
- 'LEGEND' => render_element_name($row),
+ 'LEGEND' => $legend,
'U_EDIT' => get_root_url().'admin.php?page=photo-'.$row['id'],
'NAME' => !empty($row['name'])?$row['name']:'',
'AUTHOR' => !empty($row['author'])?htmlspecialchars($row['author']):'',