Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-02-18 18:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Orange-Management/oms-Exchange into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-04-19 19:12:53 +02:00
commit 84e7921f69
9 changed files with 58 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin/Install/Interfaces/DatabaseExchanger/Exporter.php
View File

@ -57,7 +57,6 @@ final class Exporter extends ExporterAbstract
*
* @param RequestAbstract $request Request
*
*
* @return array
*
* @since 1.0.0

1
Admin/Install/Interfaces/DatabaseExchanger/Importer.php
View File

@ -49,7 +49,6 @@ final class Importer extends ImporterAbstract
*/
public function import(\DateTime $start, \DateTime $end) : void
{
}
/**

16
Admin/Install/Interfaces/DatabaseExchanger/import.tpl.php
View File

@ -101,8 +101,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
<tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label>
<tr><td>
<select id="iConnection" name="type">
<option value="<?= $lang['Custom'] ?>"<?= ($settingData['import']['db']['self'] ?? false) ? '' : ' selected' ?>><?= $lang['Custom']; ?>
<option value="<?= $lang['Self'] ?>" <?= ($settingData['import']['db']['self'] ?? false) ? ' selected' : '' ?>><?= $lang['Self']; ?>
<option value="<?= $lang['Custom']; ?>"<?= ($settingData['import']['db']['self'] ?? false) ? '' : ' selected'; ?>><?= $lang['Custom']; ?>
<option value="<?= $lang['Self']; ?>" <?= ($settingData['import']['db']['self'] ?? false) ? ' selected' : ''; ?>><?= $lang['Self']; ?>
</select>
<tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label>
<tr><td>
@ -140,8 +140,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
<tr><td><label for="iDatabaseType"><?= $lang['Connection']; ?></label>
<tr><td>
<select id="iConnection" name="type">
<option value="<?= $lang['Custom'] ?>"<?= ($settingData['export']['db']['self'] ?? false) ? '' : ' selected' ?>><?= $lang['Custom']; ?>
<option value="<?= $lang['Self'] ?>" <?= ($settingData['export']['db']['self'] ?? false) ? ' selected' : '' ?>><?= $lang['Self']; ?>
<option value="<?= $lang['Custom']; ?>"<?= ($settingData['export']['db']['self'] ?? false) ? '' : ' selected'; ?>><?= $lang['Custom']; ?>
<option value="<?= $lang['Self']; ?>" <?= ($settingData['export']['db']['self'] ?? false) ? ' selected' : ''; ?>><?= $lang['Self']; ?>
</select>
<tr><td><label for="iDatabaseType"><?= $lang['Type']; ?></label>
<tr><td>
@ -222,8 +222,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
foreach ($currentImportTableFields as $field) :
?>
<tr>
<td><label class="radio" for="import-<?= $field['COLUMN_NAME'] ?>">
<input id="import-<?= $field['COLUMN_NAME'] ?>" type="radio" name="import-field" value="1">
<td><label class="radio" for="import-<?= $field['COLUMN_NAME']; ?>">
<input id="import-<?= $field['COLUMN_NAME']; ?>" type="radio" name="import-field" value="1">
<span class="checkmark"></span>
</label>
<td><?= $field['DATA_TYPE']; ?>
@ -254,8 +254,8 @@ $isNew = $currentSetting instanceof NullExchangeSetting;
foreach ($currentExportTableFields as $field) :
?>
<tr>
<td><label class="radio" for="export-<?= $field['COLUMN_NAME'] ?>">
<input id="export-<?= $field['COLUMN_NAME'] ?>" type="radio" name="export-field" value="1">
<td><label class="radio" for="export-<?= $field['COLUMN_NAME']; ?>">
<input id="export-<?= $field['COLUMN_NAME']; ?>" type="radio" name="export-field" value="1">
<span class="checkmark"></span>
</label>
<td><?= $field['DATA_TYPE']; ?>

6
Controller/ApiController.php
View File

@ -19,15 +19,13 @@ use Modules\Exchange\Models\ExchangeLogMapper;
use Modules\Exchange\Models\ExchangeSetting;
use Modules\Exchange\Models\ExchangeSettingMapper;
use Modules\Exchange\Models\InterfaceManager;
use Modules\Exchange\Models\PermissionCategory;
use Modules\Exchange\Models\InterfaceManagerMapper;
use Modules\Exchange\Models\PermissionCategory;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings;
use Modules\Media\Models\UploadFile;
use phpOMS\Account\PermissionType;
use phpOMS\Autoloader;
use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\Localization\L11nManager;
@ -37,8 +35,6 @@ use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\Directory;
use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Utils\StringUtils;
/**