composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 18:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°931 Fix bug when max allowed items set to 1

Browse Source
This commit is contained in:
Molkobain
2018-12-14 11:11:59 +01:00
parent b4448c5bb9
commit 9b5d8b8a01
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/ormset.class.inc.php
View File

@@ -264,7 +264,7 @@ class ormSet
*/
public function Add($oItem)
{
if (($this->iLimit != 0) && ($this->Count() === $this->iLimit))
if (($this->iLimit != 0) && ($this->Count() > $this->iLimit))
{
throw new CoreException("Maximum number of items ({$this->iLimit}) reached for {$this->sClass}:{$this->sAttCode}");
}

7
js/jquery.itop-set-widget.js
View File

@@ -278,6 +278,13 @@ $.widget('itop.set_widget',
}
}
// When only one item allowed, selectize doesn't trigger the _onTagRemove callback so we have to clean ourselves.
if((this.maxItemsAllowed === 1) && (this.originalValue.length > 0)) {
if(setItemCode !== this.originalValue[0]) {
this.setItemsCodesStatus[this.originalValue[0]] = this.STATUS_REMOVED;
}
}
this.refresh();
},