Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GitBull
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
GitBull
Merge requests
!5
Resolve "Connect to CORE"
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Resolve "Connect to CORE"
32-connect-to-core
into
master
Overview
0
Commits
29
Pipelines
11
Changes
5
Merged
Resolve "Connect to CORE"
Danae Savvidi
requested to merge
32-connect-to-core
into
master
Oct 19, 2023
Overview
0
Commits
29
Pipelines
11
Changes
5
Closes
#32 (closed)
0
0
Merge request reports
Viewing commit
402dc5a2
Prev
Next
Show latest version
5 files
+
51
−
51
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
402dc5a2
fix thymeleaf not working
· 402dc5a2
Danae Savvidi
authored
Oct 24, 2023
src/main/java/server/controller/AccountController.java
+
4
−
4
View file @ 402dc5a2
Edit in single-file editor
Open in Web IDE
Show full file
@@ -40,12 +40,12 @@ public class AccountController {
// TODO: maybe this can be added on the frontend with th:if
// if (gitLabApi == null) {
//
model.addAttribute("message", "You do not have any key.");
model
.
addAttribute
(
"message"
,
"You do not have any key."
);
// } else {
// model.addAttribute("message", "You already have a key.");
// }
return
"account"
;
return
"
user/
account"
;
}
/**
@@ -59,7 +59,7 @@ public class AccountController {
//String currentUser = gitBullSecurity.getCurrentUsername(apiKeyDTO.getSecret());
accountService
.
updateAPIKey
(
person
.
getId
(),
apiKey
);
model
.
addAttribute
(
"message"
,
"Key successfully added."
);
return
"
redirect:
/account"
;
return
"
user
/account"
;
}
/**
@@ -72,6 +72,6 @@ public class AccountController {
Long
personId
=
person
.
getId
();
accountService
.
updateAPIKey
(
personId
,
null
);
model
.
addAttribute
(
"message"
,
"Key successfully deleted."
);
return
"
redirect:
/account"
;
return
"
user
/account"
;
}
}
Loading