mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-13 05:01:43 +00:00
check for saving empty category and keyword (Bug #148)
This commit is contained in:
parent
0d61fc80ec
commit
885a26a6a4
|
@ -40,6 +40,9 @@ if ($action == "addcategory") {
|
||||||
}
|
}
|
||||||
|
|
||||||
$name = $_POST["name"];
|
$name = $_POST["name"];
|
||||||
|
if (!$name) {
|
||||||
|
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
|
||||||
|
}
|
||||||
if (is_object($dms->getKeywordCategoryByName($name, $user->getID()))) {
|
if (is_object($dms->getKeywordCategoryByName($name, $user->getID()))) {
|
||||||
UI::exitError(getMLText("admin_tools"),getMLText("keyword_exists"));
|
UI::exitError(getMLText("admin_tools"),getMLText("keyword_exists"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,6 +44,51 @@ class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style {
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<script language="JavaScript">
|
<script language="JavaScript">
|
||||||
|
|
||||||
|
function checkForm(num)
|
||||||
|
{
|
||||||
|
msg = new Array();
|
||||||
|
eval("var formObj = document.form" + num + ";");
|
||||||
|
|
||||||
|
if (formObj.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
|
||||||
|
if (msg != "")
|
||||||
|
{
|
||||||
|
noty({
|
||||||
|
text: msg.join('<br />'),
|
||||||
|
type: 'error',
|
||||||
|
dismissQueue: true,
|
||||||
|
layout: 'topRight',
|
||||||
|
theme: 'defaultTheme',
|
||||||
|
_timeout: 1500,
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkKeywordForm(num)
|
||||||
|
{
|
||||||
|
msg = new Array();
|
||||||
|
eval("var formObj = document.formk" + num + ";");
|
||||||
|
|
||||||
|
if (formObj.keywords.value == "") msg.push("<?php printMLText("js_no_name");?>");
|
||||||
|
if (msg != "")
|
||||||
|
{
|
||||||
|
noty({
|
||||||
|
text: msg.join('<br />'),
|
||||||
|
type: 'error',
|
||||||
|
dismissQueue: true,
|
||||||
|
layout: 'topRight',
|
||||||
|
theme: 'defaultTheme',
|
||||||
|
_timeout: 1500,
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
obj = -1;
|
obj = -1;
|
||||||
function showKeywords(selectObj) {
|
function showKeywords(selectObj) {
|
||||||
if (obj != -1)
|
if (obj != -1)
|
||||||
|
@ -91,9 +136,9 @@ function showKeywords(selectObj) {
|
||||||
|
|
||||||
<table class="table-condensed"><tr>
|
<table class="table-condensed"><tr>
|
||||||
<td id="keywords0" style="display : none;">
|
<td id="keywords0" style="display : none;">
|
||||||
<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post">
|
<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" name="form0" onsubmit="return checkForm('0');">
|
||||||
<?php echo createHiddenFieldWithKey('addcategory'); ?>
|
<?php echo createHiddenFieldWithKey('addcategory'); ?>
|
||||||
<input type="Hidden" name="action" value="addcategory">
|
<input type="hidden" name="action" value="addcategory">
|
||||||
<?php printMLText("name");?>: <input type="text" name="name">
|
<?php printMLText("name");?>: <input type="text" name="name">
|
||||||
<input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>">
|
<input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>">
|
||||||
</form>
|
</form>
|
||||||
|
@ -121,7 +166,7 @@ function showKeywords(selectObj) {
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo getMLText("name")?>:</td>
|
<td><?php echo getMLText("name")?>:</td>
|
||||||
<td>
|
<td>
|
||||||
<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post">
|
<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" name="form<?php echo $category->getID()?>" onsubmit="return checkForm('<?php echo $category->getID()?>');">
|
||||||
<?php echo createHiddenFieldWithKey('editcategory'); ?>
|
<?php echo createHiddenFieldWithKey('editcategory'); ?>
|
||||||
<input type="hidden" name="action" value="editcategory">
|
<input type="hidden" name="action" value="editcategory">
|
||||||
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
|
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
|
||||||
|
@ -140,7 +185,7 @@ function showKeywords(selectObj) {
|
||||||
else
|
else
|
||||||
foreach ($lists as $list) {
|
foreach ($lists as $list) {
|
||||||
?>
|
?>
|
||||||
<form class="form-inline" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
|
<form class="form-inline" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" name="formk<?php echo $list['id']?>" onsubmit="return checkKeywordForm('<?php echo $list['id']?>');">
|
||||||
<?php echo createHiddenFieldWithKey('editkeywords'); ?>
|
<?php echo createHiddenFieldWithKey('editkeywords'); ?>
|
||||||
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
|
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
|
||||||
<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
|
<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user