From 0378c59da88edd320c0dd3e9dc9ab8032132c9ce Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 12 May 2024 00:06:28 +0000 Subject: [PATCH] bug fixes --- .github/workflows/greetings.yml | 2 +- Controller/ApiAddressAttributeController.php | 2 +- Controller/ApiAttributeController.php | 2 +- Models/Attribute/AddressAttributeTypeMapper.php | 2 +- Models/Attribute/UnitAttributeTypeMapper.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/department-list.tpl.php | 4 ++-- Theme/Backend/department-view.tpl.php | 4 ++-- Theme/Backend/position-list.tpl.php | 4 ++-- Theme/Backend/position-view.tpl.php | 4 ++-- Theme/Backend/unit-create.tpl.php | 8 ++++---- Theme/Backend/unit-list.tpl.php | 4 ++-- Theme/Backend/unit-view.tpl.php | 8 ++++---- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index adb8716..75cb759 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -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.' diff --git a/Controller/ApiAddressAttributeController.php b/Controller/ApiAddressAttributeController.php index 98487a5..9606d7b 100644 --- a/Controller/ApiAddressAttributeController.php +++ b/Controller/ApiAddressAttributeController.php @@ -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) diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index a9c6e07..0da4768 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -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) diff --git a/Models/Attribute/AddressAttributeTypeMapper.php b/Models/Attribute/AddressAttributeTypeMapper.php index 5694cd4..1e3efe5 100644 --- a/Models/Attribute/AddressAttributeTypeMapper.php +++ b/Models/Attribute/AddressAttributeTypeMapper.php @@ -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'], diff --git a/Models/Attribute/UnitAttributeTypeMapper.php b/Models/Attribute/UnitAttributeTypeMapper.php index 3b09e41..46e46df 100644 --- a/Models/Attribute/UnitAttributeTypeMapper.php +++ b/Models/Attribute/UnitAttributeTypeMapper.php @@ -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'], diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index ba4a0ae..f6ec9ef 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -29,7 +29,7 @@ return ['Organization' => [ 'Parent' => 'Elternteil', 'Position' => 'Position', 'Positions' => 'Positionen', - 'Postal' => 'Zip', + 'Postal' => 'Postal', 'Search' => 'Suche', 'Status' => 'Status', 'Unit' => 'Einheit', diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index dd9bfdf..f285f25 100755 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -33,7 +33,7 @@ echo $this->data['nav']->render(); ?>
-
+
getHtml('Departments'); ?>download
@@ -109,6 +109,6 @@ echo $this->data['nav']->render(); ?> getHtml('Next', '0', '0'); ?> --> - + \ No newline at end of file diff --git a/Theme/Backend/department-view.tpl.php b/Theme/Backend/department-view.tpl.php index 2911bc1..ca6ede3 100644 --- a/Theme/Backend/department-view.tpl.php +++ b/Theme/Backend/department-view.tpl.php @@ -25,7 +25,7 @@ $isNew = $department->id === 0; echo $this->data['nav']->render(); ?>
-
+
data['nav']->render(); ?>
-
+
diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php index 9b909bf..d4a4368 100755 --- a/Theme/Backend/position-list.tpl.php +++ b/Theme/Backend/position-list.tpl.php @@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
-
+
getHtml('Positions'); ?>download
@@ -101,6 +101,6 @@ echo $this->data['nav']->render(); ?> getHtml('Next', '0', '0'); ?> --> - + diff --git a/Theme/Backend/position-view.tpl.php b/Theme/Backend/position-view.tpl.php index d716cc3..624055a 100644 --- a/Theme/Backend/position-view.tpl.php +++ b/Theme/Backend/position-view.tpl.php @@ -27,7 +27,7 @@ $isNew = $position->id === 0; echo $this->data['nav']->render(); ?>
-
+
data['nav']->render(); ?>
-
+
diff --git a/Theme/Backend/unit-create.tpl.php b/Theme/Backend/unit-create.tpl.php index 86e1464..213fff8 100755 --- a/Theme/Backend/unit-create.tpl.php +++ b/Theme/Backend/unit-create.tpl.php @@ -29,7 +29,7 @@ echo $this->data['nav']->render(); ?> data-redirect="?id={/0/response/id}">
-
+
getHtml('Unit'); ?>
@@ -60,11 +60,11 @@ echo $this->data['nav']->render(); ?>
-
+
-
+
getHtml('MainAddress'); ?>
@@ -102,7 +102,7 @@ echo $this->data['nav']->render(); ?>
-
+
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index 97005d0..9cb684e 100755 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
-
+
getHtml('Units'); ?>download
@@ -100,6 +100,6 @@ echo $this->data['nav']->render(); ?> getHtml('Next', '0', '0'); ?> --> - + diff --git a/Theme/Backend/unit-view.tpl.php b/Theme/Backend/unit-view.tpl.php index 86ff229..fde852c 100644 --- a/Theme/Backend/unit-view.tpl.php +++ b/Theme/Backend/unit-view.tpl.php @@ -45,7 +45,7 @@ echo $this->data['nav']->render(); ?>
-
+
@@ -98,11 +98,11 @@ echo $this->data['nav']->render(); ?>
-
+
-
+
getHtml('MainAddress'); ?>
@@ -148,7 +148,7 @@ echo $this->data['nav']->render(); ?>
-
+
getData('unit-selector')->getData('unit-selector-popup')->render(); ?>