inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-02-02 11:24:51 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into feat--matrix-testing

Browse Source
This commit is contained in:
Matthias Mair
2026-01-19 21:57:39 +01:00
parent b7fa42eeea 6311f75201
commit c1072345e1
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/qc_checks.yaml vendored
View File

@@ -763,7 +763,7 @@ jobs:
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload SARIF file - name: Upload SARIF file
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # pin@v3 uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v3
with: with:
sarif_file: results.sarif sarif_file: results.sarif
category: zizmor category: zizmor

2
.github/workflows/release.yaml vendored
View File

@@ -55,7 +55,7 @@ jobs:
- name: Build frontend - name: Build frontend
run: cd src/frontend && npm run compile && npm run build run: cd src/frontend && npm run compile && npm run build
- name: Create SBOM for frontend - name: Create SBOM for frontend
uses: anchore/sbom-action@a930d0ac434e3182448fe678398ba5713717112a # pin@v0 uses: anchore/sbom-action@0b82b0b1a22399a1c542d4d656f70cd903571b5c # pin@v0
with: with:
artifact-name: frontend-build.spdx artifact-name: frontend-build.spdx
path: src/frontend path: src/frontend

2
.github/workflows/scorecard.yaml vendored
View File

@@ -67,6 +67,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard. # Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning" - name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9 uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
with: with:
sarif_file: results.sarif sarif_file: results.sarif

6
contrib/container/requirements.txt
View File

@@ -118,9 +118,9 @@ psycopg-pool==3.3.0 \
--hash=sha256:2e44329155c410b5e8666372db44276a8b1ebd8c90f1c3026ebba40d4bc81063 \ --hash=sha256:2e44329155c410b5e8666372db44276a8b1ebd8c90f1c3026ebba40d4bc81063 \
--hash=sha256:fa115eb2860bd88fce1717d75611f41490dec6135efb619611142b24da3f6db5 --hash=sha256:fa115eb2860bd88fce1717d75611f41490dec6135efb619611142b24da3f6db5
# via psycopg # via psycopg
pyasn1==0.6.1 \ pyasn1==0.6.2 \
--hash=sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629 \ --hash=sha256:1eb26d860996a18e9b6ed05e7aae0e9fc21619fcee6af91cca9bad4fbea224bf \
--hash=sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034 --hash=sha256:9b59a2b25ba7e4f8197db7686c09fb33e658b98339fadb826e9512629017833b
# via # via
# pyasn1-modules # pyasn1-modules
# python-ldap # python-ldap

4
src/backend/InvenTree/InvenTree/sso.py
View File

@@ -96,7 +96,9 @@ def ensure_sso_groups(sender, sociallogin: SocialLogin, **kwargs):
group_map = json.loads(get_global_setting('SSO_GROUP_MAP')) group_map = json.loads(get_global_setting('SSO_GROUP_MAP'))
# map SSO groups to InvenTree groups # map SSO groups to InvenTree groups
group_names = [] group_names = []
for sso_group in sociallogin.account.extra_data.get(group_key, []): for sso_group in sociallogin.account.extra_data.get('userinfo', {}).get(
group_key, []
):
if mapped_name := group_map.get(sso_group): if mapped_name := group_map.get(sso_group):
group_names.append(mapped_name) group_names.append(mapped_name)

2
src/backend/InvenTree/InvenTree/test_auth.py
View File

@@ -38,7 +38,7 @@ class TestSsoGroupSync(TransactionTestCase):
'SSO_GROUP_MAP', '{"idp_group": "inventree_group"}' 'SSO_GROUP_MAP', '{"idp_group": "inventree_group"}'
) )
# configure sociallogin # configure sociallogin
extra_data = {'groups': ['idp_group']} extra_data = {'userinfo': {'groups': ['idp_group']}}
self.group = Group(name='inventree_group') self.group = Group(name='inventree_group')
self.group.save() self.group.save()
# ensure default group exists # ensure default group exists

12
src/frontend/src/forms/PurchaseOrderForms.tsx
View File

@@ -361,12 +361,7 @@ function LineItemFormRow({
// Serial number generator // Serial number generator
const serialNumberGenerator = useSerialNumberGenerator({ const serialNumberGenerator = useSerialNumberGenerator({
isEnabled: () => batchOpen && trackable, isEnabled: () => batchOpen && trackable
onGenerate: (value: any) => {
if (value) {
props.changeFn(props.idx, 'serial_numbers', value);
}
}
}); });
const [packagingOpen, packagingHandlers] = useDisclosure(false, { const [packagingOpen, packagingHandlers] = useDisclosure(false, {
@@ -726,7 +721,10 @@ function LineItemFormRow({
field_type: 'string', field_type: 'string',
label: t`Serial Numbers`, label: t`Serial Numbers`,
description: t`Enter serial numbers for received items`, description: t`Enter serial numbers for received items`,
value: props.item.serial_numbers value: props.item.serial_numbers,
placeholderAutofill: true,
placeholder:
serialNumberGenerator.result && `${serialNumberGenerator.result}`
}} }}
error={props.rowErrors?.serial_numbers?.message} error={props.rowErrors?.serial_numbers?.message}
/> />