Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
Uploader
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Genesys PGR
Uploader
Commits
85ab4a9a
Commit
85ab4a9a
authored
Feb 07, 2019
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Settings fail to load when refreshToken missing
parent
729f50ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
anno-gui/src/main/java/org/genesys2/anno/gui/DwcaBuilder.java
...-gui/src/main/java/org/genesys2/anno/gui/DwcaBuilder.java
+3
-1
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
+1
-1
No files found.
anno-gui/src/main/java/org/genesys2/anno/gui/DwcaBuilder.java
View file @
85ab4a9a
...
...
@@ -311,7 +311,9 @@ public class DwcaBuilder extends AbstractModelObject {
oAuthSettings
.
setClientKey
(
jsonSettings
.
getString
(
"clientKey"
));
oAuthSettings
.
setClientSecret
(
jsonSettings
.
getString
(
"clientSecret"
));
oAuthSettings
.
setScope
(
StringUtils
.
defaultIfBlank
(
jsonSettings
.
getString
(
"scope"
),
"read,write"
));
oAuthSettings
.
setRefreshToken
(
jsonSettings
.
getString
(
"refreshToken"
));
if
(
jsonSettings
.
has
(
"refreshToken"
))
{
oAuthSettings
.
setRefreshToken
(
jsonSettings
.
getString
(
"refreshToken"
));
}
oAuthSettings
.
setServerUrl
(
jsonSettings
.
getString
(
"serverUrl"
));
oAuthSettings
.
setTokenEndpoint
(
jsonSettings
.
getString
(
"tokenEndpoint"
));
...
...
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
View file @
85ab4a9a
...
...
@@ -501,7 +501,7 @@ public class PushDialog extends Dialog {
}
if
(
futures
.
size
()
>
1
)
{
_log
.
warn
(
"Waiting for uploads still running: "
+
futures
.
size
());
_log
.
debug
(
"Waiting for uploads still running: "
+
futures
.
size
());
}
// We're the last job
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment