mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-24 12:54:11 +01:00
Compare commits
5 Commits
feature/76
...
issue/3.2-
| Author | SHA1 | Date | |
|---|---|---|---|
|
fd19008b18 | ||
|
|
05b16f5c1e | ||
|
|
c8ad539e89 | ||
|
|
330e8f48da | ||
|
|
2147ae9105 |
@@ -6,10 +6,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>180</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>190</rank>
|
||||
</item>
|
||||
</items>
|
||||
@@ -20,10 +20,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>200</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>210</rank>
|
||||
</item>
|
||||
</items>
|
||||
@@ -34,10 +34,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>170</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>180</rank>
|
||||
</item>
|
||||
</items>
|
||||
@@ -48,10 +48,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>170</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>180</rank>
|
||||
</item>
|
||||
</items>
|
||||
@@ -62,10 +62,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>60</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>70</rank>
|
||||
</item>
|
||||
</items>
|
||||
@@ -76,10 +76,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>170</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>180</rank>
|
||||
</item>
|
||||
</items>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
SetupWebPage::AddModule(
|
||||
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
|
||||
'itop-bridge-endusers-devices-services/3.2.0',
|
||||
'itop-bridge-endusers-devices-services/3.2.0-1',
|
||||
array(
|
||||
// Identification
|
||||
//
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>130</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>140</rank>
|
||||
</item>
|
||||
</items>
|
||||
@@ -20,10 +20,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>120</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>130</rank>
|
||||
</item>
|
||||
</items>
|
||||
@@ -34,10 +34,10 @@
|
||||
<presentation>
|
||||
<details>
|
||||
<items>
|
||||
<item id="providercontracts_list" _delta="define">
|
||||
<item id="providercontracts_list" _delta="define_if_not_exists">
|
||||
<rank>70</rank>
|
||||
</item>
|
||||
<item id="services_list" _delta="define">
|
||||
<item id="services_list" _delta="define_if_not_exists">
|
||||
<rank>80</rank>
|
||||
</item>
|
||||
</items>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
SetupWebPage::AddModule(
|
||||
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
|
||||
'itop-bridge-virtualization-mgmt-services/3.2.0',
|
||||
'itop-bridge-virtualization-mgmt-services/3.2.0-1',
|
||||
array(
|
||||
// Identification
|
||||
//
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
* @license http://opensource.org/licenses/AGPL-3.0
|
||||
*/
|
||||
|
||||
use Combodo\iTop\Application\WebPage\AjaxPage;
|
||||
use Combodo\iTop\Application\WebPage\JsonPage;
|
||||
|
||||
require_once(APPROOT.'application/utils.inc.php');
|
||||
require_once(APPROOT.'core/log.class.inc.php');
|
||||
@@ -110,14 +110,15 @@ function DoBackup($sTargetFile)
|
||||
*/
|
||||
function ReportStatus($sMessage, $bSuccess, $iErrorCode = 0, $aMoreFields = array())
|
||||
{
|
||||
$oPage = new AjaxPage("");
|
||||
$oPage->SetContentType('application/json');
|
||||
// Do not use AjaxPage during setup phases, because it uses InterfaceDiscovery in Twig compilation
|
||||
$oPage = new JsonPage();
|
||||
$aResult = array(
|
||||
'code' => $iErrorCode,
|
||||
'message' => $sMessage,
|
||||
'fields' => $aMoreFields
|
||||
);
|
||||
$oPage->add(json_encode($aResult));
|
||||
$oPage->SetData($aResult);
|
||||
$oPage->SetOutputDataOnly(true);
|
||||
$oPage->output();
|
||||
}
|
||||
|
||||
|
||||
@@ -338,9 +338,6 @@ HTML
|
||||
<value id="IMAP">
|
||||
<code>IMAP</code>
|
||||
</value>
|
||||
<value id="WEBHOOK">
|
||||
<code>WEBHOOK</code>
|
||||
</value>
|
||||
</values>
|
||||
<sql>scope</sql>
|
||||
<default_value>SMTP,IMAP</default_value>
|
||||
@@ -663,9 +660,6 @@ HTML
|
||||
<value id="IMAP">
|
||||
<code>IMAP</code>
|
||||
</value>
|
||||
<value id="WEBHOOK">
|
||||
<code>WEBHOOK</code>
|
||||
</value>
|
||||
</values>
|
||||
<sql>scope</sql>
|
||||
<default_value>SMTP,IMAP</default_value>
|
||||
|
||||
@@ -31,7 +31,7 @@ $.fn.modal.Constructor.prototype.enforceFocus = function () {
|
||||
var $parent = $(e.target.parentNode);
|
||||
if ($modalElement[0] !== e.target && !$modalElement.has(e.target).length &&
|
||||
!$parent.hasClass('ck-input')) {
|
||||
$(e.target.activeElement).focus();
|
||||
e.target.focus()
|
||||
}
|
||||
})
|
||||
};
|
||||
|
||||
@@ -383,13 +383,13 @@ class NavigationMenu extends UIBlock implements iKeyboardShortcut
|
||||
}
|
||||
|
||||
$sPageJS = $oPage->GetJS();
|
||||
$oPage->add_ready_script('$(\'[data-role="ibo-navigation-menu--silo-selection--form"] #org_id\').on(\'extkeychange\', function() { $(\'[data-role="ibo-navigation-menu--silo-selection--form"]\').submit(); } );');
|
||||
$oPage->add_ready_script('$(\'[data-role="ibo-navigation-menu--silo-selection--form"] #label_org_id\').on(\'click\', function() { if ($(\'[data-role="ibo-navigation-menu--silo-selection--form"] #org_id\').val() == \'\') { $(this).val(\'\'); } } );');
|
||||
$sPageReadyJS = $oPage->GetReadyJS();
|
||||
$this->aSiloSelection['js'] =
|
||||
<<<JS
|
||||
$sPageJS
|
||||
$sPageReadyJS
|
||||
$('[data-role="ibo-navigation-menu--silo-selection--form"] #org_id').on('extkeychange', function() { $('[data-role="ibo-navigation-menu--silo-selection--form"]').submit(); } )
|
||||
$('[data-role="ibo-navigation-menu--silo-selection--form"] #label_org_id').on('click', function() { if ($('[data-role="ibo-navigation-menu--silo-selection--form"] #org_id').val() == '') { $(this).val(''); } } );
|
||||
$sAddClearButton
|
||||
JS;
|
||||
}
|
||||
|
||||
@@ -919,7 +919,7 @@ class WebPage implements Page
|
||||
|
||||
// Check if URI is absolute ("://" do allow any protocol), otherwise warn that it's a deprecated behavior
|
||||
if (false === stripos($sLinkedScriptAbsUrl, "://")) {
|
||||
IssueLog::Debug("Linked script added to page with a non absolute URL, it may lead to it not being loaded and causing javascript errors. See alternatives WebPage::LinkScriptFromXXX", null, [
|
||||
IssueLog::Warning("Linked script added to page via deprecated API with a non absolute URL, it may lead to it not being loaded and causing javascript errors.", null, [
|
||||
"linked_script_url" => $sLinkedScriptAbsUrl,
|
||||
"request_uri" => $_SERVER['REQUEST_URI'] ?? '' /* CLI */,
|
||||
]);
|
||||
@@ -1188,7 +1188,7 @@ JS;
|
||||
|
||||
// Check if URI is absolute ("://" do allow any protocol), otherwise warn that it's a deprecated behavior
|
||||
if (false === stripos($sLinkedStylesheet, "://")) {
|
||||
IssueLog::Debug("Linked stylesheet added to page with a non absolute URL, it may lead to it not being loaded and causing visual glitches. See alternatives WebPage::LinkStylesheetFromXXX", null, [
|
||||
IssueLog::Warning("Linked stylesheet added to page via deprecated API with a non absolute URL, it may lead to it not being loaded and causing visual glitches.", null, [
|
||||
"linked_stylesheet_url" => $sLinkedStylesheet,
|
||||
"request_uri" => $_SERVER['REQUEST_URI'] ?? '' /* CLI */,
|
||||
]);
|
||||
|
||||
Reference in New Issue
Block a user