Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Commits
b0031619
Commit
b0031619
authored
2 years ago
by
pka065
Browse files
Options
Downloads
Patches
Plain Diff
Add legacy_stedkode for OU with a filter correction option specific for UiB
parent
14627379
No related branches found
Branches containing commit
No related tags found
1 merge request
!357
Add legacy_stedkode for OU with a filter correction option specific for UiB
Pipeline
#163718
failed
2 years ago
Stage: venv update
Stage: tests and linting
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
greg/importers/orgreg.py
+2
-1
2 additions, 1 deletion
greg/importers/orgreg.py
gregsite/settings/base.py
+5
-1
5 additions, 1 deletion
gregsite/settings/base.py
with
7 additions
and
2 deletions
greg/importers/orgreg.py
+
2
−
1
View file @
b0031619
...
...
@@ -72,7 +72,8 @@ class OrgregImporter:
matching_ids
=
[
x
for
x
in
ou
.
external_keys
if
x
.
source_system
==
extra_id
[
"
source
"
]
and
x
.
type
==
extra_id
[
"
type
"
]
if
((
x
.
source_system
==
extra_id
[
"
source
"
]
and
x
.
type
==
extra_id
[
"
type
"
])
or
(
x
.
type
==
"
legacy_stedkode
"
and
settings
.
INSTITUTION
==
"
uib
"
))
]
if
not
matching_ids
:
...
...
This diff is collapsed.
Click to expand it.
gregsite/settings/base.py
+
5
−
1
View file @
b0031619
...
...
@@ -294,6 +294,10 @@ INTERNAL_RK_PREFIX = "no.{instance}.greg".format(instance=INSTANCE_NAME)
# No trailing slash
BASE_URL
=
"
https://example.org
"
#Three-letter abbreviation, e.g. "uio", "uib".
#Is used while importing data from dependent services for correction of filters.
INSTITUTION
=
"
uib
"
FEIDE_SOURCE
=
"
feide
"
# The default duration for a new invitation link, in days
...
...
@@ -305,7 +309,7 @@ ORGREG_NAME = "orgreg_id"
# Extra ids to be imported from orgreg, list of dict with source/type.
# [{"source": "sapuio", "type": "legacy_stedkode"}]
ORGREG_EXTRA_IDS
=
[]
ORGREG_EXTRA_IDS
=
[
{
"
source
"
:
""
,
"
type
"
:
"
legacy_stedkode
"
}
]
# Acronyms to be imported as identifiers from orgreg. List of acronym values, supported ones are: nob, nno, eng
# Example list: ["nob"]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment