Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c414eb3683 | |||
| 5ddd1a3923 | |||
aac67d8550
|
|||
|
3debde96c9
|
|||
|
03f31f3e8b
|
|||
|
3d83650f7c
|
@ -40,6 +40,10 @@ class d3ActionWizard extends AdminDetailsController
|
||||
$this->configuration = oxNew(Configuration::class);
|
||||
}
|
||||
|
||||
public function getViewId()
|
||||
{
|
||||
return 'd3mxDataWizard_Action';
|
||||
}
|
||||
public function getGroups(): array
|
||||
{
|
||||
return $this->configuration->getActionGroups();
|
||||
|
||||
@ -45,6 +45,11 @@ class d3ExportWizard extends AdminDetailsController
|
||||
$this->configuration = oxNew(Configuration::class);
|
||||
}
|
||||
|
||||
public function getViewId()
|
||||
{
|
||||
return 'd3mxDataWizard_Export';
|
||||
}
|
||||
|
||||
public function getGroups(): array
|
||||
{
|
||||
return $this->configuration->getExportGroups();
|
||||
|
||||
@ -6,6 +6,12 @@
|
||||
[{oxscript include="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"}]
|
||||
[{oxstyle include="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/solid.min.css"}]
|
||||
|
||||
[{if $readonly}]
|
||||
[{assign var="readonly" value="readonly disabled"}]
|
||||
[{else}]
|
||||
[{assign var="readonly" value=""}]
|
||||
[{/if}]
|
||||
|
||||
<style>
|
||||
button {
|
||||
margin: 1em 1em 1em 5em;
|
||||
@ -41,9 +47,9 @@
|
||||
}, 3000);
|
||||
document.getElementById('mask').className='on';
|
||||
document.getElementById('popup2').className='d3loader-2 on';
|
||||
document.getElementById('taskid').value = id;
|
||||
document.getElementById('format').value = format;
|
||||
document.getElementById('myedit').submit();
|
||||
form = document.getElementById('form_' + id);
|
||||
form.format.value = format;
|
||||
form.submit();
|
||||
}
|
||||
[{/strip}][{/capture}]
|
||||
[{oxscript add=$smarty.capture.d3script}]
|
||||
@ -72,12 +78,12 @@
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
|
||||
<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post">
|
||||
<form name="myedit" id="form_[{$id}]" action="[{$oViewConf->getSelfLink()}]" method="post">
|
||||
[{$oViewConf->getHiddenSid()}]
|
||||
<input type="hidden" name="cl" value="[{$oViewConf->getActiveClassName()}]">
|
||||
<input type="hidden" name="fnc" value="runTask">
|
||||
<input type="hidden" name="taskid" id="taskid" value="">
|
||||
<input type="hidden" name="format" id="format" value="CSV">
|
||||
<input type="hidden" name="taskid" value="[{$id}]">
|
||||
<input type="hidden" name="format" value="CSV">
|
||||
|
||||
|
||||
[{if $item->getDescription()}]
|
||||
@ -91,7 +97,7 @@
|
||||
<p class="card-text" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" style="cursor: pointer">
|
||||
[{$shorttext}]...
|
||||
</p>
|
||||
<p class="card-text collapse" id="collapseExample">
|
||||
<p class="card-text collapse" id="collapseExample_[{$id}]">
|
||||
...[{$description|replace:$shorttext:''}]
|
||||
</p>
|
||||
[{/if}]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[{block name="submitElements"}]
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-primary" onclick="if (confirm('[{oxmultilang ident="D3_DATAWIZARD_ACTION_SUBMIT_CONFIRM"}]') === true) {startTask('[{$id}]')}">
|
||||
<div class="btn-group" [{$readonly}]>
|
||||
<button type="button" class="btn btn-primary" onclick="if (confirm('[{oxmultilang ident="D3_DATAWIZARD_ACTION_SUBMIT_CONFIRM"}]') === true) {startTask('[{$id}]')}" [{$readonly}]>
|
||||
<i class="fas fa-fw fa-magic"></i>
|
||||
[{oxmultilang ident=$item->getButtonText()}]
|
||||
</button>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
[{block name="submitElements"}]
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-primary" onclick="startTask('[{$id}]', 'CSV')">
|
||||
<div class="btn-group" [{$readonly}]>
|
||||
<button type="button" class="btn btn-primary" onclick="startTask('[{$id}]', 'CSV')" [{$readonly}]>
|
||||
<i class="fas fa-fw fa-magic"></i>
|
||||
[{oxmultilang ident=$item->getButtonText()}]
|
||||
</button>
|
||||
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" [{$readonly}]>
|
||||
<span class="sr-only">
|
||||
<i class="fas fa-fw fa-magic"></i>
|
||||
[{oxmultilang ident=$item->getButtonText()}]
|
||||
@ -14,7 +14,7 @@
|
||||
[{block name="dataWizardFormat"}]
|
||||
[{assign var="rendererBridge" value=$item->getRendererBridge()}]
|
||||
[{foreach from=$rendererBridge->getTranslatedRendererIdList() key="key" item="translationId"}]
|
||||
<button class="dropdown-item" onclick="startTask('[{$id}]', '[{$key}]')">
|
||||
<button class="dropdown-item" onclick="startTask('[{$id}]', '[{$key}]')" [{$readonly}]>
|
||||
[{oxmultilang ident=$translationId}]
|
||||
</button>
|
||||
[{/foreach}]
|
||||
|
||||
10
CHANGELOG.md
10
CHANGELOG.md
@ -4,9 +4,15 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [Unreleased](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.1...rel_2.x)
|
||||
## [2.1.1.3](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.2...rel_2.x) - 2023-09-12
|
||||
### Added
|
||||
- apply roles and rights
|
||||
|
||||
## [2.1.1.0](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.0...2.1.1.1) - 2023-03-22
|
||||
## [2.1.1.2](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.1...2.1.1.2) - 2023-03-30
|
||||
### Fixed
|
||||
- fix JavaScript for multiple forms
|
||||
|
||||
## [2.1.1.1](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.0...2.1.1.1) - 2023-03-22
|
||||
### Fixed
|
||||
- wrong cascaded HTML elements
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
],
|
||||
"require": {
|
||||
"php": ">=7.3",
|
||||
"oxid-esales/oxideshop-ce": "6.8 - 6.13",
|
||||
"oxid-esales/oxideshop-ce": "6.8 - 6.14",
|
||||
"league/csv": "^9.0",
|
||||
"mathieuviossat/arraytotexttable": "^1.0",
|
||||
"form-manager/form-manager": "^6.1",
|
||||
|
||||
@ -31,8 +31,8 @@ $aModule = [
|
||||
'de' => '',
|
||||
'en' => '',
|
||||
],
|
||||
'thumbnail' => '',
|
||||
'version' => '2.1.1.1',
|
||||
'thumbnail' => 'logo.png',
|
||||
'version' => '2.1.1.3',
|
||||
'author' => 'D³ Data Development (Inh.: Thomas Dartsch)',
|
||||
'email' => 'support@shopmodule.com',
|
||||
'url' => 'https://www.oxidmodule.com/',
|
||||
|
||||
Reference in New Issue
Block a user