mirror of
https://github.com/Karaka-Management/oms-Organization.git
synced 2026-01-25 22:38:40 +00:00
bug fixes
This commit is contained in:
Dennis Eichhorn
parent
7324c86376
commit
0378c59da8
2
.github/workflows/greetings.yml
vendored
2
.github/workflows/greetings.yml
vendored
|
|
@ -9,5 +9,5 @@ jobs:
|
|||
- uses: actions/first-interaction@v1
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
issue-message: 'Thank you for createing this issue. We will check it as soon as possible.'
|
||||
issue-message: 'Thank you for creating this issue. We will check it as soon as possible.'
|
||||
pr-message: 'Thank you for your pull request. We will check it as soon as possible.'
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ final class ApiAddressAttributeController extends Controller
|
|||
->where('id', (int) $request->getData('type'))
|
||||
->execute();
|
||||
|
||||
if (!$type->repeatable) {
|
||||
if (!$type->isRepeatable) {
|
||||
$attr = AddressAttributeMapper::count()
|
||||
->with('type')
|
||||
->where('type/id', $type->id)
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ final class ApiAttributeController extends Controller
|
|||
->where('id', (int) $request->getData('type'))
|
||||
->execute();
|
||||
|
||||
if (!$type->repeatable) {
|
||||
if (!$type->isRepeatable) {
|
||||
$attr = UnitAttributeMapper::count()
|
||||
->with('type')
|
||||
->where('type/id', $type->id)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ final class AddressAttributeTypeMapper extends DataMapperFactory
|
|||
'address_attr_type_datatype' => ['name' => 'address_attr_type_datatype', 'type' => 'int', 'internal' => 'datatype'],
|
||||
'address_attr_type_fields' => ['name' => 'address_attr_type_fields', 'type' => 'int', 'internal' => 'fields'],
|
||||
'address_attr_type_custom' => ['name' => 'address_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'],
|
||||
'address_attr_type_repeatable' => ['name' => 'address_attr_type_repeatable', 'type' => 'bool', 'internal' => 'repeatable'],
|
||||
'address_attr_type_repeatable' => ['name' => 'address_attr_type_repeatable', 'type' => 'bool', 'internal' => 'isRepeatable'],
|
||||
'address_attr_type_internal' => ['name' => 'address_attr_type_internal', 'type' => 'bool', 'internal' => 'isInternal'],
|
||||
'address_attr_type_pattern' => ['name' => 'address_attr_type_pattern', 'type' => 'string', 'internal' => 'validationPattern'],
|
||||
'address_attr_type_required' => ['name' => 'address_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'],
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ final class UnitAttributeTypeMapper extends DataMapperFactory
|
|||
'unit_attr_type_datatype' => ['name' => 'unit_attr_type_datatype', 'type' => 'int', 'internal' => 'datatype'],
|
||||
'unit_attr_type_fields' => ['name' => 'unit_attr_type_fields', 'type' => 'int', 'internal' => 'fields'],
|
||||
'unit_attr_type_custom' => ['name' => 'unit_attr_type_custom', 'type' => 'bool', 'internal' => 'custom'],
|
||||
'unit_attr_type_repeatable' => ['name' => 'unit_attr_type_repeatable', 'type' => 'bool', 'internal' => 'repeatable'],
|
||||
'unit_attr_type_repeatable' => ['name' => 'unit_attr_type_repeatable', 'type' => 'bool', 'internal' => 'isRepeatable'],
|
||||
'unit_attr_type_internal' => ['name' => 'unit_attr_type_internal', 'type' => 'bool', 'internal' => 'isInternal'],
|
||||
'unit_attr_type_pattern' => ['name' => 'unit_attr_type_pattern', 'type' => 'string', 'internal' => 'validationPattern'],
|
||||
'unit_attr_type_required' => ['name' => 'unit_attr_type_required', 'type' => 'bool', 'internal' => 'isRequired'],
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ return ['Organization' => [
|
|||
'Parent' => 'Elternteil',
|
||||
'Position' => 'Position',
|
||||
'Positions' => 'Positionen',
|
||||
'Postal' => 'Zip',
|
||||
'Postal' => 'Postal',
|
||||
'Search' => 'Suche',
|
||||
'Status' => 'Status',
|
||||
'Unit' => 'Einheit',
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ echo $this->data['nav']->render(); ?>
|
|||
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head"><?= $this->getHtml('Departments'); ?><i class="g-icon download btn end-xs">download</i></div>
|
||||
<div class="slider">
|
||||
<table id="departmentList" class="default sticky">
|
||||
|
|
@ -109,6 +109,6 @@ echo $this->data['nav']->render(); ?>
|
|||
<a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -25,7 +25,7 @@ $isNew = $department->id === 0;
|
|||
echo $this->data['nav']->render(); ?>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<form id="iDepartment"
|
||||
method="<?= $isNew ? 'PUT' : 'POST'; ?>"
|
||||
action="<?= UriFactory::build('{/api}organization/department?{?}&csrf={$CSRF}'); ?>"
|
||||
|
|
@ -76,7 +76,7 @@ echo $this->data['nav']->render(); ?>
|
|||
<?php endif; ?>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
|
|||
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head"><?= $this->getHtml('Positions'); ?><i class="g-icon download btn end-xs">download</i></div>
|
||||
<div class="slider">
|
||||
<table id="positionList" class="default sticky">
|
||||
|
|
@ -101,6 +101,6 @@ echo $this->data['nav']->render(); ?>
|
|||
<a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ $isNew = $position->id === 0;
|
|||
echo $this->data['nav']->render(); ?>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<form id="iPosition"
|
||||
method="<?= $isNew ? 'PUT' : 'POST'; ?>"
|
||||
action="<?= UriFactory::build('{/api}organization/position?{?}&csrf={$CSRF}'); ?>"
|
||||
|
|
@ -77,7 +77,7 @@ echo $this->data['nav']->render(); ?>
|
|||
<?php endif; ?>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ echo $this->data['nav']->render(); ?>
|
|||
data-redirect="<?= UriFactory::build('{/base}/organization/unit/view'); ?>?id={/0/response/id}">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head"><?= $this->getHtml('Unit'); ?></div>
|
||||
<div class="portlet-body">
|
||||
<div class="form-group">
|
||||
|
|
@ -60,11 +60,11 @@ echo $this->data['nav']->render(); ?>
|
|||
<input id="iUnitCreate" name="submit" type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head"><?= $this->getHtml('MainAddress'); ?></div>
|
||||
<div class="portlet-body">
|
||||
<div class="form-group">
|
||||
|
|
@ -102,7 +102,7 @@ echo $this->data['nav']->render(); ?>
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
|
|||
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head"><?= $this->getHtml('Units'); ?><i class="g-icon download btn end-xs">download</i></div>
|
||||
<div class="slider">
|
||||
<table id="unitList" class="default sticky">
|
||||
|
|
@ -100,6 +100,6 @@ echo $this->data['nav']->render(); ?>
|
|||
<a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ echo $this->data['nav']->render(); ?>
|
|||
<form id="iUnitUploadForm" action="<?= UriFactory::build('{/api}organization/unit/image?id={?id}&csrf={$CSRF}'); ?>" method="post"><input class="preview" data-action='[{"listener": "change", "key": 1, "action": [{"key": 1, "type": "form.submit", "selector": "#iUnitUploadForm"}]}]' id="iUnitUpload" name="unitImage" type="file" accept="image/png,image/gif,image/jpeg" style="display: none;"></form>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<form id="iUnit" action="<?= UriFactory::build('{/api}organization/unit?csrf={$CSRF}'); ?>" method="post">
|
||||
<div class="portlet-head row middle-xs">
|
||||
<div class="col-xs-0">
|
||||
|
|
@ -98,11 +98,11 @@ echo $this->data['nav']->render(); ?>
|
|||
<input id="iSubmit" name="submit" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div class="portlet">
|
||||
<section class="portlet">
|
||||
<div class="portlet-head"><?= $this->getHtml('MainAddress'); ?></div>
|
||||
<form id="iUnitMainAdress" action="<?= UriFactory::build('{/api}organization/unit/address/main?csrf={$CSRF}'); ?>" method="post">
|
||||
<div class="portlet-body">
|
||||
|
|
@ -148,7 +148,7 @@ echo $this->data['nav']->render(); ?>
|
|||
<input id="iSubmit" name="submit" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
<?= $this->getData('unit-selector')->getData('unit-selector-popup')->render(); ?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user