mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-24 12:54:11 +01:00
Compare commits
5 Commits
3.0.3
...
3.0.3-desi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78d8829d65 | ||
|
|
307edd3f7a | ||
|
|
6bf906a72f | ||
|
|
0f016d7511 | ||
|
|
d782987f50 |
@@ -37,7 +37,7 @@ iTop also offers mass import tools to help you being even more efficient.
|
||||
- [iTop Forums][1]: community support
|
||||
- [iTop Tickets][2]: for feature requests and bug reports
|
||||
- [Releases download][3]
|
||||
- [Software requirements][4]
|
||||
- [iTop requirements][4]
|
||||
- [Documentation][5] covering both iTop and its official extensions
|
||||
- [iTop Hub][6] : discover and install extensions !
|
||||
|
||||
@@ -45,7 +45,7 @@ iTop also offers mass import tools to help you being even more efficient.
|
||||
[1]: https://sourceforge.net/p/itop/discussion/
|
||||
[2]: https://sourceforge.net/p/itop/tickets/
|
||||
[3]: https://sourceforge.net/projects/itop/files/itop/
|
||||
[4]: https://www.itophub.io/wiki/page?id=latest:install:upgrading_itop
|
||||
[4]: https://www.itophub.io/wiki/page?id=latest:install:requirements
|
||||
[5]: https://www.itophub.io/wiki
|
||||
[6]: https://store.itophub.io/en_US/
|
||||
|
||||
|
||||
@@ -323,7 +323,7 @@ $(function()
|
||||
oParams.dashletid = sTempDashletId;
|
||||
|
||||
$.post(this.options.new_dashletid_endpoint, oParams, function (data) {
|
||||
me.add_dashlet_prepare(options, data);
|
||||
me.add_dashlet_prepare(options, data.trim());
|
||||
});
|
||||
},
|
||||
add_dashlet_ajax: function (options, sDashletId) {
|
||||
|
||||
@@ -794,8 +794,12 @@ const CombodoTooltip = {
|
||||
InitTooltipFromMarkup: function (oElem, bForce = false) {
|
||||
const oOptions = {};
|
||||
|
||||
// First, check if the tooltip isn't already instantiated
|
||||
if ((oElem.attr('data-tooltip-instantiated') === 'true') && (bForce === false)) {
|
||||
// First, check if the jQuery element actually represent DOM elements
|
||||
if (oElem.length === 0) {
|
||||
return false;
|
||||
}
|
||||
// Then, check if the tooltip isn't already instantiated
|
||||
else if ((oElem.attr('data-tooltip-instantiated') === 'true') && (bForce === false)) {
|
||||
return false;
|
||||
}
|
||||
else if((oElem.attr('data-tooltip-instantiated') === 'true') && (bForce === true) && (oElem[0]._tippy !== undefined)){
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace Combodo\iTop\Test\UnitTest\Core;
|
||||
|
||||
use CMDBSource;
|
||||
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
|
||||
use MetaModel;
|
||||
|
||||
@@ -76,7 +75,8 @@ class AttributeDefinitionTest extends ItopDataTestCase {
|
||||
\$ormLinkset = \$oObject->Get('workorders_list');
|
||||
\$ormLinkset->AddItem(MetaModel::NewObject('WorkOrder', []));
|
||||
\$oObject->Set('workorders_list', \$ormLinkset);
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -88,7 +88,8 @@ PHP,
|
||||
\$ormLinkset = \$oObject->Get('contacts_list');
|
||||
\$ormLinkset->AddItem(MetaModel::NewObject('lnkContactToTicket', []));
|
||||
\$oObject->Set('contacts_list', \$ormLinkset);
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -97,7 +98,8 @@ PHP,
|
||||
'value',
|
||||
<<<PHP
|
||||
\$oObject->Set('value', 100);
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -106,7 +108,8 @@ PHP,
|
||||
'speed',
|
||||
<<<PHP
|
||||
\$oObject->Set('speed', 1024.5);
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -115,7 +118,8 @@ PHP,
|
||||
'title',
|
||||
<<<PHP
|
||||
\$oObject->Set('title', 'Some title');
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -124,7 +128,8 @@ PHP,
|
||||
'item_id',
|
||||
<<<PHP
|
||||
\$oObject->Set('item_id', 12);
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -133,7 +138,8 @@ PHP,
|
||||
'org_id',
|
||||
<<<PHP
|
||||
\$oObject->Set('org_id', 3);
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -142,7 +148,8 @@ PHP,
|
||||
'file',
|
||||
<<<PHP
|
||||
\$oObject->Set('file', new ormDocument('something', 'text/plain', 'something.txt'));
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
@@ -167,7 +174,8 @@ PHP,
|
||||
/** @var \ormPassword \$ormPassword */
|
||||
\$ormPassword = new ormPassword('somehash', 'somesalt');
|
||||
\$oObject->Set('password', \$ormPassword);
|
||||
PHP,
|
||||
PHP
|
||||
,
|
||||
false,
|
||||
true,
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user