diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/MenusData.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/MenusData.json index ccb29dd..47f12d7 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/MenusData.json +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/MenusData.json @@ -954,6 +954,16 @@ "RequiredPermissionName": "App.Definitions.WorkHour", "IsDisabled": false }, + { + "ParentCode": "App.Administration.Definitions", + "Code": "App.IpRestrictions", + "DisplayName": "App.IpRestrictions", + "Order": 3, + "Url": "/admin/list/App.IpRestrictions", + "Icon": "FcNfcSign", + "RequiredPermissionName": "App.IpRestrictions", + "IsDisabled": false + }, { "ParentCode": "App.Administration", "Code": "Abp.Identity", @@ -1024,21 +1034,11 @@ "RequiredPermissionName": "Abp.Identity.OrganizationUnits", "IsDisabled": false }, - { - "ParentCode": "Abp.Identity", - "Code": "App.IpRestrictions", - "DisplayName": "App.IpRestrictions", - "Order": 7, - "Url": "/admin/list/App.IpRestrictions", - "Icon": "FcNfcSign", - "RequiredPermissionName": "App.IpRestrictions", - "IsDisabled": false - }, { "ParentCode": "Abp.Identity", "Code": "App.AuditLogs", "DisplayName": "App.AuditLogs", - "Order": 8, + "Order": 7, "Url": "/admin/list/App.AuditLogs", "Icon": "FcMultipleInputs", "RequiredPermissionName": "App.AuditLogs", diff --git a/ui/src/views/admin/listForm/WizardStep3.tsx b/ui/src/views/admin/listForm/WizardStep3.tsx index 2721dff..dc32cc4 100644 --- a/ui/src/views/admin/listForm/WizardStep3.tsx +++ b/ui/src/views/admin/listForm/WizardStep3.tsx @@ -84,7 +84,8 @@ const formatLabel = (text: string) => { .join(" "); }; -function newGroupItem(colName: string, sqlType = ''): WizardGroupItem { +function newGroupItem(colName: string, meta?: DatabaseColumnDto): WizardGroupItem { + const sqlType = meta?.dataType ?? '' return { id: `${colName}_${Date.now()}`, dataField: colName, @@ -92,7 +93,7 @@ function newGroupItem(colName: string, sqlType = ''): WizardGroupItem { editorOptions: '', editorScript: '', colSpan: 1, - isRequired: false, + isRequired: meta?.isNullable === false, turkishCaption: formatLabel(colName), englishCaption: formatLabel(colName), } @@ -467,8 +468,7 @@ const WizardStep3 = ({ const availableColumns = [...selectedColumns].filter((c) => !placedColumns.has(c)) // ── Helpers ─────────────────────────────────────────────────────────────── - const colMeta = (name: string) => - selectCommandColumns.find((c) => c.columnName === name)?.dataType ?? '' + const colMeta = (name: string) => selectCommandColumns.find((c) => c.columnName === name) const addColumnToGroup = (colName: string, targetGroupId: string) => { onGroupsChange( diff --git a/ui/src/views/admin/role-management/RolesPermission.tsx b/ui/src/views/admin/role-management/RolesPermission.tsx index a632ca2..39b4272 100644 --- a/ui/src/views/admin/role-management/RolesPermission.tsx +++ b/ui/src/views/admin/role-management/RolesPermission.tsx @@ -263,7 +263,7 @@ function RolesPermission({ return permissionList ? ( changeGroup(permissionList?.groups[0].name)} onClose={onDialogClose} @@ -275,12 +275,12 @@ function RolesPermission({
-
+
{translate('AbpPermissionManagement::SelectAllInAllTabs')}
-
+
{translate('AbpPermissionManagement::SelectAllInThisTab')} @@ -288,7 +288,7 @@ function RolesPermission({
-
+

-
+

changeGroup(permissionList?.groups[0].name)} onClose={onDialogClose} @@ -230,12 +230,12 @@ function UsersPermission({
-
+
{translate('AbpPermissionManagement::SelectAllInAllTabs')}
-
+
{translate('AbpPermissionManagement::SelectAllInThisTab')} @@ -243,7 +243,7 @@ function UsersPermission({
-
+

{permissionList?.groups.map((group) => ( @@ -261,7 +261,7 @@ function UsersPermission({ ))}
-
+

{selectedGroupPermissions.map((permission) => (