Skip to content

Commit

Permalink
Merge branch 'master' into UIBULKED-321
Browse files Browse the repository at this point in the history
  • Loading branch information
UladzislauKutarkin authored Aug 10, 2023
2 parents d6d2eb3 + f841919 commit 1f44cbe
Show file tree
Hide file tree
Showing 32 changed files with 83 additions and 51 deletions.
1 change: 1 addition & 0 deletions src/components/BulkEditActionMenu/BulkEditActionMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const BulkEditActionMenu = ({
|| (hasItemInventoryEdit && capability === CAPABILITIES.ITEM)
|| (hasUserEditInAppPerm && capability === CAPABILITIES.USER);


useFileDownload({
id,
fileInfo,
Expand Down
1 change: 1 addition & 0 deletions src/hooks/useBulkPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const useBulkPermissions = () => {
const hasUserEditInAppPerm = hasInAppUsersEditPerms && hasUsersPerms;
const hasAnyEditPermissions = hasAnyUserWithBulkPerm || hasAnyInventoryWithInAppView;


// Logs perms
const hasLogViewPerms = stripes.hasPerm('ui-bulk-edit.logs.view');
const hasLogItemViewPerms = hasLogViewPerms && hasItemsPerms;
Expand Down
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/ber.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
45 changes: 23 additions & 22 deletions translations/ui-bulk-edit/cs_CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -331,26 +331,27 @@
"ariaLabel.actionsSelect": "Vybrat akce",
"layer.options.items.removeNote": "Odstranit",
"logs.infoPopover": "Soubory nejsou k dispozici ke stažení, protože od data spuštění úlohy uplynulo 30 dní.",
"permissionsModal.title": "Select Permissions",
"permissionsModal.filter.title": "Search & filter",
"permissionsModal.filter.search": "Search",
"permissionsModal.filter.resetAll": "Reset all",
"permissionsModal.filter.permissionTypes": "Permission types",
"permissionsModal.filter.permissionSets": "Permission sets",
"permissionsModal.filter.permissions": "Permissions",
"permissionsModal.filter.assignmentStatus": "Permission assignment status",
"permissionsModal.filter.assigned": "Assigned",
"permissionsModal.filter.unassigned": "Unassigned",
"permissionsModal.list.columns.name": "Name",
"permissionsModal.list.columns.type": "Type",
"permissionsModal.list.columns.status": "Status",
"permissionsModal.list.cell.assigned": "Assigned",
"permissionsModal.list.cell.unassigned": "Unassigned",
"permissionsModal.list.cell.permissionSets": "Permission set",
"permissionsModal.list.cell.permissions": "Permission",
"permissionsModal.list.title": "Permissions",
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.title": "Vyberte Oprávnění",
"permissionsModal.filter.title": "Hledat a filtrovat",
"permissionsModal.filter.search": "Vyhledávání",
"permissionsModal.filter.resetAll": "Obnovit vše",
"permissionsModal.filter.permissionTypes": "Typy oprávnění",
"permissionsModal.filter.permissionSets": "Sady oprávnění",
"permissionsModal.filter.permissions": "Oprávnění",
"permissionsModal.filter.assignmentStatus": "Stav přiřazení oprávnění",
"permissionsModal.filter.assigned": "Přiřazeno",
"permissionsModal.filter.unassigned": "Nepřiřazeno",
"permissionsModal.list.columns.name": "Jméno",
"permissionsModal.list.columns.type": "Typ",
"permissionsModal.list.columns.status": "Stav",
"permissionsModal.list.cell.assigned": "Přiřazeno",
"permissionsModal.list.cell.unassigned": "Nepřiřazeno",
"permissionsModal.list.cell.permissionSets": "Sada oprávnění",
"permissionsModal.list.cell.permissions": "Oprávnění",
"permissionsModal.list.title": "Oprávnění",
"permissionsModal.list.subTitle": "{count} nalezených oprávnění",
"permissionsModal.cancel": "Zrušit",
"permissionsModal.save": "Uložit a zavřít",
"permissionsModal.totalSelected": "Celkem vybráno: {count}",
"layer.options.items.duplicateTo": "Duplikovat do"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/en_SE.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/es_419.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{contar} permisos encontrados",
"permissionsModal.cancel": "Cancelar",
"permissionsModal.save": "Guardar y cerrar",
"permissionsModal.totalSelected": "Total seleccionado: {count}"
"permissionsModal.totalSelected": "Total seleccionado: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/hi_IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/it_IT.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/nb.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/nn.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/pt_BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissões encontradas",
"permissionsModal.cancel": "Cancelar",
"permissionsModal.save": "Salvar e fechar",
"permissionsModal.totalSelected": "Total selecionado: {count}"
"permissionsModal.totalSelected": "Total selecionado: {count}",
"layer.options.items.duplicateTo": "Duplicar para"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/pt_PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/ur.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/zh_CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "找到{count}个权限",
"permissionsModal.cancel": "取消",
"permissionsModal.save": "保存并关闭",
"permissionsModal.totalSelected": "已选总数: {count}"
"permissionsModal.totalSelected": "已选总数: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}
3 changes: 2 additions & 1 deletion translations/ui-bulk-edit/zh_TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,5 +352,6 @@
"permissionsModal.list.subTitle": "{count} permissions found",
"permissionsModal.cancel": "Cancel",
"permissionsModal.save": "Save & close",
"permissionsModal.totalSelected": "Total selected: {count}"
"permissionsModal.totalSelected": "Total selected: {count}",
"layer.options.items.duplicateTo": "Duplicate to"
}

0 comments on commit 1f44cbe

Please sign in to comment.