iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

related to #1465 category name addded

Browse Source
This commit is contained in:
Matthieu Leproux
2021-09-22 13:28:12 +02:00
committed by plegall
parent fcc14158a1
commit 5730be596c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/themes/default/js/history.js
View File

@@ -47,7 +47,9 @@ $(document).ready(() => {
});
$("#start_unset").on("click", function () {
console.log("here" + current_param.start);
if (!current_param.start == "") {
current_param.pageNumber = 0;
current_param.start = "";
fillHistoryResult(current_param);
@@ -261,8 +263,10 @@ function lineConstructor(line, id, imageDisplay) {
break;
case "categories":
newLine.find(".type-name").html(line.CATEGORY);
newLine.find(".type-id").remove();
if (line.IMAGE == "") {
newLine.find(".type-id").remove();
}
break;
default:
break;
}

2
admin/themes/default/template/history.tpl
View File

@@ -151,7 +151,7 @@ const str_recent_pics = "{'Recent photos'|translate}";
<span class="type-icon"> <i class="icon-file-image"> </i> </span>
<span class="icon-ellipsis-vert toggle-img-option">
<div class="img-option">
<span class="add-img-as-filter"> Add as filter </span>
<span class="add-img-as-filter"> {'Add a filter'|translate} </span>
<a class="edit-img" href="">{'Edit'|@translate}</a>
</div>
</span>

4
include/ws_functions/pwg.php
View File

@@ -921,7 +921,7 @@ SELECT
$thumbnail_display = 'no_display_thumbnail';
}
$image_title = '('.$line['image_id'].')';
$image_title = '';
if (isset($image_infos[$line['image_id']]['label']))
{
@@ -954,7 +954,7 @@ SELECT
'EDIT_IMAGE'=> $image_edit_string,
'TYPE' => $line['image_type'],
'SECTION' => $line['section'],
'CATEGORY' => isset($name_of_category[$line['category_id']]) ? $name_of_category[$line['category_id']] : 'Root'.$line['category_id'],
'CATEGORY' => isset($name_of_category[$line['category_id']]) ? $name_of_category[$line['category_id']] : l10n('Root').$line['category_id'],
'TAGS' => explode(",",$tag_names),
'TAGIDS' => explode(",",$tag_ids),
)