composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2504 N°3169 N°5102 Handle result display

Browse Source
This commit is contained in:
Stephen Abello
2022-05-13 14:28:38 +02:00
parent caf939bf58
commit 58b27a9daa
10 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/composer/ClassLoader.php
View File

@@ -149,7 +149,7 @@ class ClassLoader
/**
* @return string[] Array of classname => path
* @psalm-var array<string, string>
* @psalm-return array<string, string>
*/
public function getClassMap()
{

13
lib/composer/InstalledVersions.php
View File

@@ -24,8 +24,21 @@ use Composer\Semver\VersionParser;
*/
class InstalledVersions
{
/**
* @var mixed[]|null
* @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
*/
private static $installed;
/**
* @var bool|null
*/
private static $canGetVendors;
/**
* @var array[]
* @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
*/
private static $installedByVendor = array();
/**

9
lib/composer/autoload_real.php
View File

@@ -60,11 +60,16 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
}
}
/**
* @param string $fileIdentifier
* @param string $file
* @return void
*/
function composerRequire0018331147de7601e7552f7da8e3bb8b($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
require $file;
}
}

8
lib/composer/installed.php
View File

@@ -5,7 +5,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '134736dce5289b252d1017b3a2f3bbb03b6e63a8',
'reference' => 'caf939bf5835556317f457cd33e666e2de1d7815',
'name' => '__root__',
'dev' => true,
),
@@ -16,7 +16,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'reference' => '134736dce5289b252d1017b3a2f3bbb03b6e63a8',
'reference' => 'caf939bf5835556317f457cd33e666e2de1d7815',
'dev_requirement' => false,
),
'combodo/tcpdf' => array(
@@ -268,8 +268,8 @@
'psr/container-implementation' => array(
'dev_requirement' => false,
'provided' => array(
0 => '1.0',
1 => '^1.0',
0 => '^1.0',
1 => '1.0',
),
),
'psr/http-message' => array(

0
lib/laminas/laminas-servicemanager/bin/generate-deps-for-config-factory Normal file → Executable file
View File

0
lib/laminas/laminas-servicemanager/bin/generate-factory-for-class Normal file → Executable file
View File

3
sources/Controller/OAuth/OAuthAjaxController.php
View File

@@ -36,7 +36,8 @@ class OAuthAjaxController extends Controller
$sAdditional = utils::ReadParam('additional', '', false, 'raw');
$sRedirectUrlQuery = parse_url($sRedirectUrl)['query'];
$aOAuthResultDisplayClasses = utils::GetClassesForInterface('Combodo\iTop\Core\Authentication\Client\OAuth\IOAuthClientResultDisplay', '', array('[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]'));
// TODO: Needs to handle mail to ticket part too
$aOAuthResultDisplayClasses = ['\Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientResultDisplayConf'];
$aAdditional = [];
parse_str($sAdditional, $aAdditional);

1
sources/Controller/OAuth/OAuthWizardController.php
View File

@@ -43,6 +43,7 @@ class OAuthWizardController extends Controller
'redirect_uri' => ['type' => 'text', 'label' => Dict::S('UI:OAuth:Wizard:Form:Input:RedirectUri:Label'), 'read_only' => true, 'value' => OAuthClientProviderAbstract::GetRedirectUri()],
];
// TODO: Needs to handle mail to ticket part too
$aParams['aAdditionalBlocks'] = [
OAuthClientResultDisplayConf::GetResultDisplayTemplate(),
];

2
templates/pages/backoffice/oauth/Wizard.html.twig
View File

@@ -33,7 +33,7 @@
type="{{ aInput.type }}"
id="wizard_input_{{ sName }}"
name="{{ sName }}"
{% if aInput.real_only %} readonly {% endif %}
{% if aInput.read_only %} readonly {% endif %}
value="{{ aInput.value }}"
>
</div>

2
templates/pages/backoffice/oauth/Wizard.ready.js.twig
View File

@@ -8,7 +8,7 @@ const oOnOauthSuccess = function (event){
$.post(
'{{ sAjaxUri }}',
{
operation: 'get_display_authentication_results',
operation: 'GetDisplayAuthenticationResults',
provider: $('[name="provider"]:checked').val(),
client_id: $('[name="client_id"]').val(),
client_secret: $('[name="client_secret"]').val(),