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

started with template fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-03-29 15:26:00 +00:00
parent b6d94bb2ee
commit de77dec883
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ declare(strict_types=1);
use Modules\Exchange\Models\NullExchangeSetting;
use phpOMS\DataStorage\Database\Connection\ConnectionFactory;
use phpOMS\DataStorage\Database\Connection\NullConnection;
use phpOMS\DataStorage\Database\DatabaseStatus;
use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\SchemaMapper;
use phpOMS\Uri\UriFactory;
@ -64,8 +65,8 @@ if (!empty($settingData)) {
$importSchemaMapper = new SchemaMapper($importConnection);
$exportSchemaMapper = new SchemaMapper($exportConnection);
$importTables = $importSchemaMapper->getTables();
$exportTables = $exportSchemaMapper->getTables();
$importTables = $importConnection->status === DatabaseStatus::OK ? $importSchemaMapper->getTables() : [];
$exportTables = $exportConnection->status === DatabaseStatus::OK ? $exportSchemaMapper->getTables() : [];
$currentImportTableFields = empty($importTables) ? [] : $importSchemaMapper->getFields($importTables[0]);
$currentExportTableFields = empty($exportTables) ? [] : $exportSchemaMapper->getFields($exportTables[0]);
@ -317,14 +318,14 @@ $isNew = $currentSetting->id === 0;
<div class="portlet-body">
<div class="form-group">
<label for="iTitle"><?= $this->getHtml('Column1'); ?></label>
<input type="text" id="iTitle" name="column1title" placeholder="<?= $this->getHtml('Title'); ?>">
<input type="text" id="iTitle" name="column1title">
</div>
<div class="form-group">
<label for="iTitle"><?= $this->getHtml('Filter1'); ?></label>
<div class="ipt-wrap">
<div class="ipt-first">
<input type="text" id="iTitle" name="title" placeholder="<?= $this->getHtml('Title'); ?>">
<input type="text" id="iTitle" name="title">
</div>
<div class="ipt-second">
<select nma="column1comparison">
@ -340,14 +341,14 @@ $isNew = $currentSetting->id === 0;
<div class="form-group">
<label for="iTitle"><?= $this->getHtml('Column2'); ?></label>
<input type="text" id="iTitle" name="column2title" placeholder="<?= $this->getHtml('Title'); ?>">
<input type="text" id="iTitle" name="column2title">
</div>
<div class="form-group">
<label for="iTitle"><?= $this->getHtml('Filter2'); ?></label>
<div class="ipt-wrap">
<div class="ipt-first">
<input type="text" id="iTitle" name="title" placeholder="<?= $this->getHtml('Title'); ?>">
<input type="text" id="iTitle" name="title">
</div>
<div class="ipt-second">
<select name="column2comparison">

2
Admin/Routes/Web/Api.php
View File

@ -22,6 +22,7 @@ return [
[
'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeImport',
'verb' => RouteVerb::SET,
'csrf' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
@ -33,6 +34,7 @@ return [
[
'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeExport',
'verb' => RouteVerb::SET,
'csrf' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,

2
Controller/BackendController.php
View File

@ -189,7 +189,6 @@ final class BackendController extends Controller
$view->data['db'] = $this->app->dbPool->get();
$lang = \is_file($langFile = $interface->source->getAbsolutePath() . '/'
. $interface->source->name
. '/Lang/' . $response->header->l11n->language . '.lang.php'
) ? include $langFile : [];
@ -228,7 +227,6 @@ final class BackendController extends Controller
$view->data['db'] = $this->app->dbPool->get();
$lang = \is_file($langFile = $interface->source->getAbsolutePath() . '/'
. $interface->source->name
. '/Lang/' . $response->header->l11n->language . '.lang.php'
) ? include $langFile : [];

4
Theme/Backend/exchange-export.tpl.php
View File

@ -19,6 +19,4 @@ echo $this->data['nav']->render();
$interface = $this->data['interface'];
include $interface->source->getAbsolutePath() . '/'
. $interface->source->name . '/'
. 'export.tpl.php';
include $interface->source->getAbsolutePath() . '/export.tpl.php';

6
Theme/Backend/exchange-import.tpl.php
View File

@ -19,6 +19,6 @@ echo $this->data['nav']->render();
$interface = $this->data['interface'];
include $interface->source->getAbsolutePath() . '/'
. $interface->source->name . '/'
. 'import.tpl.php';
$a = $interface->source->getAbsolutePath();
include $interface->source->getAbsolutePath() . '/import.tpl.php';

2
tests/Interfaces/OMS/import.tpl.php
View File

@ -23,7 +23,7 @@ $lang = $this->getData('lang');
<table class="layout wf-100" style="table-layout: fixed">
<tbody>
<tr><td><label for="iFile"><?= $this->getHtml('File'); ?></label>
<tr><td><input type="file" id="iFile" name="file" placeholder="<?= $this->getHtml('File'); ?>" required>
<tr><td><input type="file" id="iFile" name="file" required>
</table>
</div>
<div class="portlet-foot">