gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2022-02-22 17:55:01 +01:00
commit 0869e97a1a
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -223,6 +223,7 @@
- new mail body for changing a version comment
- add hook documentListPreview
- various improvements for workflows
- output splash message when removing, editing, adding a category or keyword
--------------------------------------------------------------------------------
Changes in version 5.1.24

9
op/op.Categories.php
View File

@ -54,6 +54,9 @@ if ($action == "addcategory") {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$categoryid=$newCategory->getID();
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_category')));
add_log_line(".php&action=addcategory&categoryid=".$categoryid);
}
//Kategorie löschen ----------------------------------------------------------------------------------
@ -76,6 +79,9 @@ else if ($action == "removecategory") {
if (!$category->remove()) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_category')));
add_log_line(".php&action=removecategory&categoryid=".$categoryid);
$categoryid=-1;
}
@ -100,6 +106,9 @@ else if ($action == "editcategory") {
if (!$category->setName($name)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_category')));
add_log_line(".php&action=editcategory&categoryid=".$categoryid);
}
else {

18
op/op.DefaultKeywords.php
View File

@ -54,6 +54,9 @@ if ($action == "addcategory") {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$categoryid=$newCategory->getID();
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_keyword_category')));
add_log_line(".php&action=addcategory&categoryid=".$categoryid);
}
// Delete keyword categorie ---------------------------------------------
@ -80,6 +83,9 @@ else if ($action == "removecategory") {
if (!$category->remove()) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_keyword_category')));
add_log_line(".php&action=removecategory&categoryid=".$categoryid);
$categoryid=-1;
}
@ -109,6 +115,9 @@ else if ($action == "editcategory") {
if (!$category->setName($name)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_keyword_category')));
add_log_line(".php&action=editcategory&categoryid=".$categoryid);
}
// Modify keyword categorie: new list of keywords -----------------------
@ -132,6 +141,9 @@ else if ($action == "newkeywords") {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_keyword')));
add_log_line(".php&action=newkeywords&categoryid=".$categoryid);
}
// Modify keyword categorie: modify list of keywords -------------------
@ -166,6 +178,9 @@ else if ($action == "editkeywords")
if (!$category->editKeywordList($keywordsid, $keywords)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_keyword')));
add_log_line(".php&action=editkeywords&categoryid=".$categoryid);
}
// Modify keyword categorie: delete list of keywords --------------------
@ -198,6 +213,9 @@ else if ($action == "removekeywords") {
if (!$category->removeKeywordList($keywordsid)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_keyword')));
add_log_line(".php&action=removekeywords&categoryid=".$categoryid);
}
else {
UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));

4
views/bootstrap/class.Search.php
View File

@ -287,7 +287,7 @@ function typeahead() { /* {{{ */
getMLText("search_query"),
array(
'element'=>'input',
'type'=>'text',
'type'=>'search',
'name'=>'query',
'value'=>htmlspecialchars($this->query)
)
@ -569,7 +569,7 @@ function typeahead() { /* {{{ */
getMLText("search_query"),
array(
'element'=>'input',
'type'=>'text',
'type'=>'search',
'name'=>'query',
'value'=>htmlspecialchars($this->query)
)