Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
ec3a13fa
Commit
ec3a13fa
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
warning message improved
parent
5780f1d5
No related branches found
No related tags found
1 merge request
!980
Resolve "Add warning dialog before removing "general view" overlays"
Pipeline
#15535
passed
5 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG
+2
-0
2 additions, 0 deletions
CHANGELOG
frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+7
-1
7 additions, 1 deletion
frontend-js/src/main/js/gui/admin/EditProjectDialog.js
with
9 additions
and
1 deletion
CHANGELOG
+
2
−
0
View file @
ec3a13fa
minerva (15.0.0~alpha.0) stable; urgency=medium
minerva (15.0.0~alpha.0) stable; urgency=medium
* Small improvement: when downloading a map results in too big file (>1MB)
* Small improvement: when downloading a map results in too big file (>1MB)
the content is compressed and returned as a zip file (#348)
the content is compressed and returned as a zip file (#348)
* Small improvement: confirmation dialog when removing "general view"
overlays contain proper warning (#809)
* Bug fix: position of structural state is preserved on upload CellDesigner
* Bug fix: position of structural state is preserved on upload CellDesigner
file (#671)
file (#671)
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+
7
−
1
View file @
ec3a13fa
...
@@ -506,8 +506,14 @@ EditProjectDialog.prototype._createOverlayTable = function () {
...
@@ -506,8 +506,14 @@ EditProjectDialog.prototype._createOverlayTable = function () {
var
button
=
this
;
var
button
=
this
;
var
overlayId
=
parseInt
(
$
(
button
).
attr
(
"
data
"
));
var
overlayId
=
parseInt
(
$
(
button
).
attr
(
"
data
"
));
var
overlay
=
self
.
_overlayById
[
overlayId
];
var
overlay
=
self
.
_overlayById
[
overlayId
];
var
confirmationMessage
=
"
Do you want to delete overlay:
"
+
overlay
.
getName
()
+
"
?
"
;
if
(
!
overlay
.
getInputDataAvailable
())
{
confirmationMessage
+=
"
<br/><span style='color:red;font-weight:bold'>Warning: This contains one of the map's
"
+
"
diagrams and is required<br/>
"
+
"
for map display. Removing it cannot be undone.</span>
"
}
return
GuiConnector
.
showConfirmationDialog
({
return
GuiConnector
.
showConfirmationDialog
({
message
:
"
Do you want to delete overlay:
"
+
overlay
.
getName
()
+
"
?
"
message
:
confirmationMessage
}).
then
(
function
(
confirmation
)
{
}).
then
(
function
(
confirmation
)
{
if
(
confirmation
)
{
if
(
confirmation
)
{
$
(
button
).
attr
(
"
disabled
"
,
true
);
$
(
button
).
attr
(
"
disabled
"
,
true
);
...
...
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