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
b30d073d
Commit
b30d073d
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
glyph tab
parent
a97a66fa
No related branches found
No related tags found
1 merge request
!915
Resolve "Add GLYPHS tab in Add project window"
Pipeline
#13278
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/AddProjectDialog.js
+2
-3
2 additions, 3 deletions
frontend-js/src/main/js/gui/admin/AddProjectDialog.js
with
4 additions
and
3 deletions
CHANGELOG
+
2
−
0
View file @
b30d073d
...
@@ -13,6 +13,8 @@ minerva (14.0.0~beta.0) unstable; urgency=low
...
@@ -13,6 +13,8 @@ minerva (14.0.0~beta.0) unstable; urgency=low
* Small improvement: information about person who uploaded project is visible
* Small improvement: information about person who uploaded project is visible
in list of projects (#927)
in list of projects (#927)
* Small improvement: user role introduced in edit user dialog (#924)
* Small improvement: user role introduced in edit user dialog (#924)
* Small improvement: tab with list of glyps is available when adding project
with glyphs (#925)
* Bug fix: work on FF Private Window mode could cause logout or raise an
* Bug fix: work on FF Private Window mode could cause logout or raise an
error on when opening new tab with minerva (#892)
error on when opening new tab with minerva (#892)
* Bug fix: fetching list of miRnas resulted sometimes in "Internal Server
* Bug fix: fetching list of miRnas resulted sometimes in "Internal Server
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/main/js/gui/admin/AddProjectDialog.js
+
2
−
3
View file @
b30d073d
...
@@ -80,7 +80,6 @@ AddProjectDialog.prototype.createGui = function () {
...
@@ -80,7 +80,6 @@ AddProjectDialog.prototype.createGui = function () {
content
:
self
.
createOverviewImagesTabContent
(),
content
:
self
.
createOverviewImagesTabContent
(),
disabled
:
true
disabled
:
true
});
});
};
};
/**
/**
...
@@ -573,7 +572,7 @@ AddProjectDialog.prototype._createGlyphsTable = function () {
...
@@ -573,7 +572,7 @@ AddProjectDialog.prototype._createGlyphsTable = function () {
var
data
=
[];
var
data
=
[];
for
(
var
i
=
0
;
i
<
entries
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
entries
.
length
;
i
++
)
{
var
entry
=
entries
[
i
];
var
entry
=
entries
[
i
];
if
(
entry
.
getType
()
===
"
GLYPH
S
"
)
{
if
(
entry
.
getType
()
===
"
GLYPH
"
)
{
var
row
=
[];
var
row
=
[];
row
[
0
]
=
entry
.
getFilename
();
row
[
0
]
=
entry
.
getFilename
();
data
.
push
(
row
);
data
.
push
(
row
);
...
@@ -1366,7 +1365,7 @@ AddProjectDialog.prototype.setZipFileContent = function (file) {
...
@@ -1366,7 +1365,7 @@ AddProjectDialog.prototype.setZipFileContent = function (file) {
images
++
;
images
++
;
}
else
if
(
entry
.
getType
()
===
'
OVERLAY
'
)
{
}
else
if
(
entry
.
getType
()
===
'
OVERLAY
'
)
{
overlays
++
;
overlays
++
;
}
else
if
(
entry
.
getType
()
===
'
GLYPH
S
'
)
{
}
else
if
(
entry
.
getType
()
===
'
GLYPH
'
)
{
glyphs
++
;
glyphs
++
;
}
}
}
}
...
...
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