Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Receive and save client application context. #152

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Classes/Domain/Model/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ class Client extends AbstractEntity
*/
protected $outdatedExtensions = 0;

/**
* @var string
*/
protected $applicationContext = '';

/**
* @var string
*/
Expand Down Expand Up @@ -466,6 +471,22 @@ public function setOutdatedExtensions($outdatedExtensions)
$this->outdatedExtensions = $outdatedExtensions;
}

/**
* @return string
*/
public function getApplicationContext()
{
return $this->applicationContext;
}

/**
* @param string $applicationContext
*/
public function setApplicationContext($applicationContext)
{
$this->applicationContext = $applicationContext;
}

/**
* Returns the errorMessage
*
Expand Down
1 change: 1 addition & 0 deletions Classes/Service/Import/ClientImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ protected function importSingleClient(array $row)
'disk_free_space' => $json['core']['diskFreeSpace'],
'core' => $this->getUsedCore($json['core']['typo3Version']),
'extensions' => $this->handleExtensionRelations($row['uid'], (array)$json['extensions']),
'application_context' => $json['core']['applicationContext'],
];

$this->addExtraData($json, $update, 'info');
Expand Down
13 changes: 12 additions & 1 deletion Configuration/TCA/tx_t3monitoring_domain_model_client.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'1' => [
'showitem' => '
--div--;General,title, --palette--;;paletteDomain,email,sla,tag,
--div--;Readonly information,last_successful_import,error_message,core, --palette--;;paletteVersions, --palette--;;paletteDiskSpace,extensions,
--div--;Readonly information,last_successful_import,error_message, --palette--;;paletteCore, --palette--;;paletteVersions, --palette--;;paletteDiskSpace,extensions,
insecure_core, outdated_core, insecure_extensions, outdated_extensions,
--div--;Extra,extra_info,extra_warning,extra_danger,
--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
Expand All @@ -29,6 +29,7 @@
],
],
'palettes' => [
'paletteCore' => ['showitem' => 'core, application_context'],
'paletteDomain' => ['showitem' => 'domain, secret, --linebreak--, basic_auth_username, basic_auth_password, hidden'],
'paletteVersions' => ['showitem' => 'php_version, mysql_version'],
'paletteDiskSpace' => ['showitem' => 'disk_total_space, disk_free_space'],
Expand Down Expand Up @@ -206,6 +207,16 @@
'eval' => 'int'
],
],
'application_context' => [
'exclude' => true,
'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.application_context',
'config' => [
'readOnly' => true,
'type' => 'input',
'size' => 5,
'eval' => 'trim'
],
],
'error_message' => [
'exclude' => true,
'label' => 'LLL:EXT:t3monitoring/Resources/Private/Language/locallang.xlf:tx_t3monitoring_domain_model_client.error_message',
Expand Down
4 changes: 4 additions & 0 deletions Resources/Private/Language/de.locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
<source>Outdated Extensions</source>
<target>Veraltete Extensions</target>
</trans-unit>
<trans-unit id="tx_t3monitoring_domain_model_client.application_context">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation wrong

<source>Application Context</source>
<target>Anwendungskontext</target>
</trans-unit>
<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
<source>Error Message</source>
<target>Fehlermeldung</target>
Expand Down
3 changes: 3 additions & 0 deletions Resources/Private/Language/locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@
<trans-unit id="tx_t3monitoring_domain_model_client.outdated_extensions">
<source>Outdated Extensions</source>
</trans-unit>
<trans-unit id="tx_t3monitoring_domain_model_client.application_context">
<source>Application Context</source>
</trans-unit>
<trans-unit id="tx_t3monitoring_domain_model_client.error_message">
<source>Error Message</source>
</trans-unit>
Expand Down
1 change: 1 addition & 0 deletions ext_tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ CREATE TABLE tx_t3monitoring_domain_model_client (
insecure_extensions int(11) DEFAULT '0' NOT NULL,
outdated_extensions int(11) DEFAULT '0' NOT NULL,
error_message varchar(255) DEFAULT '' NOT NULL,
application_context varchar(255) DEFAULT '' NOT NULL,
extra_info text NOT NULL,
extra_warning text NOT NULL,
extra_danger text NOT NULL,
Expand Down