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
013de7c6
Commit
013de7c6
authored
6 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
googleLicenseConsent is passed properly in new API
parent
4a9b14ec
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!307
Resolve "Pin popup window too narrow"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+8
-2
8 additions, 2 deletions
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
+3
-2
3 additions, 2 deletions
...lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
with
11 additions
and
4 deletions
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+
8
−
2
View file @
013de7c6
...
...
@@ -212,6 +212,7 @@ OverlayPanel.prototype.createTableHeader = function (edit) {
*
* @param {DataOverlay} overlay
* @param {boolean} checked
* @param {boolean} disabled
* @returns {HTMLElement}
*/
OverlayPanel
.
prototype
.
createOverlayRow
=
function
(
overlay
,
checked
,
disabled
)
{
...
...
@@ -279,9 +280,10 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled)
*
* @param {DataOverlay} overlay
* @param {boolean} checked
* @param {boolean} disabled
* @returns {Array}
*/
OverlayPanel
.
prototype
.
overlayToDataRow
=
function
(
overlay
,
checked
)
{
OverlayPanel
.
prototype
.
overlayToDataRow
=
function
(
overlay
,
checked
,
disabled
)
{
var
result
=
[];
result
[
0
]
=
overlay
.
getOrder
();
result
[
1
]
=
overlay
.
getName
();
...
...
@@ -291,7 +293,11 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked) {
if
(
checked
)
{
checkedString
=
"
checked
"
;
}
result
[
2
]
=
"
<input type='checkbox'
"
+
checkedString
+
"
data='
"
+
overlay
.
getId
()
+
"
' name='overlayToggle'/>
"
;
var
disabledString
=
""
;
if
(
disabled
)
{
disabledString
=
"
disabled
"
}
result
[
2
]
=
"
<input type='checkbox'
"
+
checkedString
+
disabledString
+
"
data='
"
+
overlay
.
getId
()
+
"
' name='overlayToggle'/>
"
;
result
[
3
]
=
"
<button data='
"
+
overlay
.
getId
()
+
"
' name='download-overlay'><span class='ui-icon ui-icon-arrowthickstop-1-s'></span></button>
"
;
}
else
{
result
[
2
]
=
"
<a href='#' data='
"
+
overlay
.
getId
()
+
"
' name='overlayLink'><img src='
"
+
GuiConnector
.
getImgPrefix
()
+
"
icons/search.png' style='float: left' hspace='5'/></a>
"
;
...
...
This diff is collapsed.
Click to expand it.
rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
+
3
−
2
View file @
013de7c6
...
...
@@ -99,6 +99,7 @@ public class OverlayRestImpl extends BaseRestImpl {
result
.
put
(
"description"
,
overlay
.
getDescription
());
result
.
put
(
"publicOverlay"
,
overlay
.
isPublicLayout
());
result
.
put
(
"defaultOverlay"
,
overlay
.
isDefaultOverlay
());
result
.
put
(
"googleLicenseConsent"
,
overlay
.
isGoogleLicenseConsent
());
List
<
Map
<
String
,
Object
>>
images
=
new
ArrayList
<>();
List
<
Layout
>
childLayouts
=
new
ArrayList
<>();
childLayouts
.
add
(
overlay
);
...
...
@@ -411,8 +412,8 @@ public class OverlayRestImpl extends BaseRestImpl {
String
column
=
string
.
toLowerCase
();
Object
value
=
null
;
if
(
column
.
equals
(
"id"
)
||
column
.
equals
(
"idobject"
)
||
column
.
equals
(
"uniqueid"
))
{
//casting to string is only to provide the same results as before refactoring
value
=
bioEntity
.
getId
()
+
""
;
//
casting to string is only to provide the same results as before refactoring
value
=
bioEntity
.
getId
()
+
""
;
}
else
if
(
column
.
equals
(
"modelid"
))
{
value
=
bioEntity
.
getModel
().
getId
();
}
else
if
(
column
.
equals
(
"value"
))
{
...
...
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