Skip to content

Commit ee724cb

Browse files
committed
fix broken edit more
1 parent e54d35a commit ee724cb

File tree

9 files changed

+35
-17
lines changed

9 files changed

+35
-17
lines changed

Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2424
### Fixed
2525

2626
- Resolved issue with filters being displayed incorrectly
27+
- USe `IS DISTINCT FROM` for [AdminForthFilterOperators.NE] in postgress to properly compare for note equal when values hold zero
2728

2829
### Added
2930
- Added adapters

adminforth/modules/restApi.ts

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -465,13 +465,30 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
465465
const toReturn = {
466466
...resource,
467467
label: translated.resLabel,
468-
columns: resource.columns.map(
469-
(col, i) => {
470-
return {
471-
...col,
472-
label: translated[`resCol${i}`],
473-
}
474-
}
468+
columns:
469+
await Promise.all(
470+
resource.columns.map(
471+
async (col, i) => {
472+
let validation = null;
473+
if (col.validation) {
474+
validation = await Promise.all(
475+
col.validation.map(async (val) => {
476+
return {
477+
...val,
478+
message: await tr(val.message, `resource.${resource.resourceId}`),
479+
}
480+
})
481+
);
482+
483+
}
484+
485+
return {
486+
...col,
487+
validation,
488+
label: translated[`resCol${i}`],
489+
}
490+
}
491+
),
475492
),
476493
options: {
477494
...resource.options,

adminforth/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "adminforth",
3-
"version": "1.5.8-next.10",
3+
"version": "1.5.8-next.11",
44
"description": "OpenSource Vue3 powered forth-generation admin panel",
55
"main": "dist/index.js",
66
"module": "dist/index.js",

adminforth/plugins/i18n/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/plugins/i18n/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adminforth/i18n",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"main": "dist/index.js",
55
"types": "dist/index.d.ts",
66
"type": "module",

adminforth/plugins/two-factors-auth/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adminforth/plugins/two-factors-auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adminforth/two-factors-auth",
3-
"version": "1.0.31",
3+
"version": "1.0.32",
44
"description": "AdminForth plugin for two factors authentication",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

adminforth/spa/src/components/GroupsTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
:key="column.name"
2121
v-if="currentValues !== null"
2222
class="bg-ligftForm dark:bg-gray-800 dark:border-gray-700 block md:table-row"
23-
:class="{ 'border-b': i !== group.columns.length - 1, 'opacity-50 pointer-events-none': column.editReadonly && source === $t('edit')}"
23+
:class="{ 'border-b': i !== group.columns.length - 1, 'opacity-50 pointer-events-none': column.editReadonly && source === 'edit'}"
2424
>
2525
<td class="px-6 py-4 flex items-center block md:table-cell pb-0 md:pb-4"
2626
:class="{'rounded-bl-lg border-b-none': i === group.columns.length - 1}"> <!--align-top-->

0 commit comments

Comments
 (0)