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
1653ddaa
Commit
1653ddaa
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
filename cases are preserved in uploaded zip files
parent
b978534a
No related branches found
No related tags found
1 merge request
!969
Resolve "UpperCase for submaps is not preserved during uploading zipped map"
Pipeline
#15171
passed
5 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG
+1
-0
1 addition, 0 deletions
CHANGELOG
frontend-js/src/main/js/gui/admin/AddProjectDialog.js
+10
-9
10 additions, 9 deletions
frontend-js/src/main/js/gui/admin/AddProjectDialog.js
with
11 additions
and
9 deletions
CHANGELOG
+
1
−
0
View file @
1653ddaa
...
...
@@ -20,6 +20,7 @@ minerva (14.0.3) stable; urgency=medium
(below 14.0.0) didn't produce valid SBML (#970)
* Bug fix: fields in add project window are reinitialized after each open
(#963)
* Bug fix: filename case in uploaded zip files is preserved (#964)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 16 Oct 2019 9:00:00 +0200
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/main/js/gui/admin/AddProjectDialog.js
+
10
−
9
View file @
1653ddaa
...
...
@@ -1429,22 +1429,23 @@ AddProjectDialog.prototype.createZipEntry = function (jsZipEntry, zipObject) {
if
(
jsZipEntry
.
dir
)
{
return
null
;
}
var
filename
=
jsZipEntry
.
name
.
toLowerCase
();
var
filename
=
jsZipEntry
.
name
;
var
lowercaseFilename
=
jsZipEntry
.
name
.
toLowerCase
();
var
type
;
var
data
=
{};
var
processingPromise
=
Promise
.
resolve
();
if
(
this
.
isIgnoredZipEntry
(
f
ilename
))
{
if
(
this
.
isIgnoredZipEntry
(
lowercaseF
ilename
))
{
type
=
undefined
;
}
else
if
(
f
ilename
.
indexOf
(
"
submaps
"
)
===
0
)
{
}
else
if
(
lowercaseF
ilename
.
indexOf
(
"
submaps
"
)
===
0
)
{
type
=
"
MAP
"
;
if
(
f
ilename
.
endsWith
(
"
mapping.xml
"
))
{
if
(
lowercaseF
ilename
.
endsWith
(
"
mapping.xml
"
))
{
data
.
mapping
=
true
;
}
}
else
if
(
f
ilename
.
indexOf
(
"
images
"
)
===
0
)
{
}
else
if
(
lowercaseF
ilename
.
indexOf
(
"
images
"
)
===
0
)
{
type
=
"
IMAGE
"
;
}
else
if
(
f
ilename
.
indexOf
(
"
glyphs
"
)
===
0
)
{
}
else
if
(
lowercaseF
ilename
.
indexOf
(
"
glyphs
"
)
===
0
)
{
type
=
"
GLYPH
"
;
}
else
if
(
f
ilename
.
indexOf
(
"
layouts
"
)
===
0
||
f
ilename
.
indexOf
(
"
overlays
"
)
===
0
)
{
}
else
if
(
lowercaseF
ilename
.
indexOf
(
"
layouts
"
)
===
0
||
lowercaseF
ilename
.
indexOf
(
"
overlays
"
)
===
0
)
{
type
=
"
OVERLAY
"
;
processingPromise
=
zipObject
.
file
(
jsZipEntry
.
name
).
async
(
"
string
"
).
then
(
function
(
content
)
{
var
overlayParser
=
new
OverlayParser
();
...
...
@@ -1460,7 +1461,7 @@ AddProjectDialog.prototype.createZipEntry = function (jsZipEntry, zipObject) {
data
.
description
=
""
;
}
});
}
else
if
(
f
ilename
.
indexOf
(
"
\\
"
)
===
-
1
&&
f
ilename
.
indexOf
(
"
/
"
)
===
-
1
)
{
}
else
if
(
lowercaseF
ilename
.
indexOf
(
"
\\
"
)
===
-
1
&&
lowercaseF
ilename
.
indexOf
(
"
/
"
)
===
-
1
)
{
type
=
"
MAP
"
;
data
.
root
=
true
;
}
else
{
...
...
@@ -1472,7 +1473,7 @@ AddProjectDialog.prototype.createZipEntry = function (jsZipEntry, zipObject) {
"
'>manual</a> for information about allowed zip file content
"
);
}
if
(
type
===
"
MAP
"
)
{
var
name
=
jsZipEntry
.
name
.
toLowerCase
()
;
var
name
=
filename
;
processingPromise
=
zipObject
.
file
(
jsZipEntry
.
name
).
async
(
"
string
"
).
then
(
function
(
content
)
{
self
.
setFileParserForFilename
(
name
,
content
);
...
...
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