Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
server
Manage
Activity
Members
Code
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
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
Show more breadcrumbs
m-team
oidc
mytoken
server
Commits
5ed339c7
Verified
Commit
5ed339c7
authored
11 months ago
by
Gabriel Zachmann
Browse files
Options
Downloads
Patches
Plain Diff
[web] fix two things in the mytoken list notification management
parent
bdcd0832
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
internal/server/web/partials/notifications/info-subscribe-modal.mustache
+1
-1
1 addition, 1 deletion
.../web/partials/notifications/info-subscribe-modal.mustache
internal/server/web/static/js/notifications.js
+8
-17
8 additions, 17 deletions
internal/server/web/static/js/notifications.js
with
9 additions
and
18 deletions
internal/server/web/partials/notifications/info-subscribe-modal.mustache
+
1
−
1
View file @
5ed339c7
...
...
@@ -18,7 +18,7 @@
<h5>
Notifications
</h5>
{{>
notifications
/
info-content-notifications
}}
</div>
<div
class=
"col alert border mx-3"
>
<div
class=
"col alert border mx-3"
id=
"notifications-calendarinfo-alert"
>
{{>
notifications
/
info-content-calendars
}}
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
internal/server/web/static/js/notifications.js
+
8
−
17
View file @
5ed339c7
...
...
@@ -43,10 +43,7 @@ function listNotifications(...next) {
$
(
'
[data-toggle="tooltip"]
'
).
tooltip
();
doNext
(...
next
);
},
error
:
function
(
errRes
)
{
$errorModalMsg
.
text
(
getErrorMessage
(
errRes
));
$errorModal
.
modal
();
},
error
:
standardErrorHandler
,
});
}
...
...
@@ -343,10 +340,7 @@ function deleteNotification() {
success
:
function
()
{
listNotifications
();
},
error
:
function
(
errRes
)
{
$errorModalMsg
.
text
(
getErrorMessage
(
errRes
));
$errorModal
.
modal
();
}
error
:
standardErrorHandler
});
}
...
...
@@ -372,10 +366,7 @@ function removeTokenFromNotificationFromMangement(mom_id) {
$
(
'
#notifications-msg
'
).
find
(
`tr[management-code=
${
mc
}
] td[role=button]`
)[
0
].
click
();
});
},
error
:
function
(
errRes
)
{
$errorModalMsg
.
text
(
getErrorMessage
(
errRes
));
$errorModal
.
modal
();
}
error
:
standardErrorHandler
});
}
...
...
@@ -511,9 +502,9 @@ function fillNotificationAndCalendarInfo(cals, notifications, $container, prefix
let
notificationsSet
=
notifications
!==
undefined
&&
notifications
.
length
>
0
;
if
(
!
calsSet
&&
!
notificationsSet
)
{
$container
.
hideB
();
return
;
}
else
{
$container
.
showB
();
}
$container
.
showB
();
fillCalendarInfo
(
cals
,
calsSet
,
prefix
);
fillNotificationInfo
(
notifications
,
notificationsSet
,
prefix
);
}
...
...
@@ -526,12 +517,12 @@ function notificationModal(doesExpire) {
let
nots
=
momIDNotificationsMap
[
id
]
||
[];
let
user_nots
=
momIDNotificationsMap
[
"
user
"
]
||
[];
nots
=
nots
.
concat
(
user_nots
);
$tokeninfoCalendarListing
(
notificationPrefix
).
showB
();
fillNotificationAndCalendarInfo
(
cals
,
nots
,
$
(
prefixId
(
"
not-info-body
"
,
notificationPrefix
)),
notificationPrefix
);
if
(
!
doesExpire
)
{
$
tokeninfoCalendarListing
(
notificationPrefix
).
hideB
();
$
(
'
#notifications-calendarinfo-alert
'
).
hideB
();
}
else
{
$
(
'
#notifications-calendarinfo-alert
'
).
showB
();
notificationModalInitSubscribeCalendars
(
cals
);
notificationModalInitEntryInvite
();
}
...
...
@@ -709,7 +700,7 @@ $('#sent-calendar-add').on('click', function () {
success
:
function
()
{
getCalendars
(
function
()
{
let
cals
=
momIDCalendarsMap
[
momID
];
fillCalendarInfo
(
cals
,
true
,
notificationPrefix
);
fillCalendarInfo
(
cals
,
cals
!==
undefined
&&
cals
.
length
>
0
,
notificationPrefix
);
notificationModalInitSubscribeCalendars
(
cals
);
});
},
...
...
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