diff --git a/admin/themes/default/js/history.js b/admin/themes/default/js/history.js index f73365a92..8f67f8299 100644 --- a/admin/themes/default/js/history.js +++ b/admin/themes/default/js/history.js @@ -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; } diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl index 918256f54..a34a47fcc 100644 --- a/admin/themes/default/template/history.tpl +++ b/admin/themes/default/template/history.tpl @@ -151,7 +151,7 @@ const str_recent_pics = "{'Recent photos'|translate}";
- Add as filter + {'Add a filter'|translate} {'Edit'|@translate}
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php index 59e8dedce..437579182 100644 --- a/include/ws_functions/pwg.php +++ b/include/ws_functions/pwg.php @@ -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), )