Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rescheduled 🗓️
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
c3lingo
rescheduled 🗓️
Commits
50d9421f
You need to sign in or sign up before continuing.
Verified
Commit
50d9421f
authored
1 month ago
by
tribut
Browse files
Options
Downloads
Patches
Plain Diff
Fix problems when engelsystem_url is not set
parent
bdfb22b6
No related branches found
No related tags found
No related merge requests found
Pipeline
#38968
passed
1 month ago
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/jobs/pretalx/import_job.rb
+1
-1
1 addition, 1 deletion
app/jobs/pretalx/import_job.rb
app/models/conference.rb
+1
-0
1 addition, 0 deletions
app/models/conference.rb
with
2 additions
and
1 deletion
app/jobs/pretalx/import_job.rb
+
1
−
1
View file @
50d9421f
...
@@ -115,7 +115,7 @@ module Pretalx
...
@@ -115,7 +115,7 @@ module Pretalx
def
import_engelsystem_refs
(
conference
)
def
import_engelsystem_refs
(
conference
)
unless
translation_angel_id
=
conference
.
fetch_translation_angel_id
unless
translation_angel_id
=
conference
.
fetch_translation_angel_id
logger
.
warn
(
"Could not find translation angel id for
#{
conference
.
slug
}
"
)
Rails
.
logger
.
warn
(
"Could not find translation angel id for
#{
conference
.
slug
}
"
)
return
return
end
end
return
unless
data
=
conference
.
fetch_engelsystem
(
"angeltypes/
#{
translation_angel_id
}
/shifts"
)
return
unless
data
=
conference
.
fetch_engelsystem
(
"angeltypes/
#{
translation_angel_id
}
/shifts"
)
...
...
This diff is collapsed.
Click to expand it.
app/models/conference.rb
+
1
−
0
View file @
50d9421f
...
@@ -131,6 +131,7 @@ class Conference < ApplicationRecord
...
@@ -131,6 +131,7 @@ class Conference < ApplicationRecord
end
end
def
fetch_engelsystem
(
endpoint
)
def
fetch_engelsystem
(
endpoint
)
return
nil
unless
engelsystem_url
endpoint_url
=
engelsystem_url
+
endpoint
endpoint_url
=
engelsystem_url
+
endpoint
Rails
.
logger
.
debug
(
"Querying engelsystem API at
#{
endpoint_url
}
"
)
Rails
.
logger
.
debug
(
"Querying engelsystem API at
#{
endpoint_url
}
"
)
response
=
HTTParty
.
get
(
response
=
HTTParty
.
get
(
...
...
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