Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSLogic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
VIPS
VIPSLogic
Commits
1a30dc2f
Commit
1a30dc2f
authored
9 years ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
Bugfix for outputting parent organism in form
parent
e28486d6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/no/nibio/vips/logic/entity/Organism.java
+1
-1
1 addition, 1 deletion
src/main/java/no/nibio/vips/logic/entity/Organism.java
src/main/webapp/templates/organismForm.ftl
+9
-7
9 additions, 7 deletions
src/main/webapp/templates/organismForm.ftl
with
10 additions
and
8 deletions
src/main/java/no/nibio/vips/logic/entity/Organism.java
+
1
−
1
View file @
1a30dc2f
...
@@ -131,7 +131,7 @@ public class Organism implements Serializable {
...
@@ -131,7 +131,7 @@ public class Organism implements Serializable {
}
}
public
String
getLatinName
()
{
public
String
getLatinName
()
{
return
latinName
;
return
latinName
!=
null
?
latinName
:
""
;
}
}
public
void
setLatinName
(
String
latinName
)
{
public
void
setLatinName
(
String
latinName
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/templates/organismForm.ftl
+
9
−
7
View file @
1a30dc2f
...
@@ -53,13 +53,15 @@
...
@@ -53,13 +53,15 @@
<select class="form-control" name="parentOrganismId" onblur="validateField(this);">
<select class="form-control" name="parentOrganismId" onblur="validateField(this);">
<option value="-1">$
{
i18nBundle
.pleaseSelect
}
$
{
i18nBundle
.parentOrganismId
?
lower_case
}
</option>
<option value="-1">$
{
i18nBundle
.pleaseSelect
}
$
{
i18nBundle
.parentOrganismId
?
lower_case
}
</option>
<#list allOrganisms?sort_by("latinName") as parentOrganism>
<#list allOrganisms?sort_by("latinName") as parentOrganism>
<option value="$
{
parentOrganism
.organismId
}
"
<#if parentOrganism.organismId gt 0>
<#if (organism.parentOrganismId?has_content && organism.parentOrganismId == parentOrganism.organismId)
<option value="$
{
parentOrganism
.organismId
}
"
|| (parentOrganismId?has_content && parentOrganismId == parentOrganism.organismId)
<#if (organism.parentOrganismId?has_content && organism.parentOrganismId == parentOrganism.organismId)
>
|| (parentOrganismId?has_content && parentOrganismId == parentOrganism.organismId)
selected="selected"
>
</#if>
selected="selected"
>$
{
parentOrganism
.latinName
!
""
}
/$
{
parentOrganism
.tradeName
!
""
}
/$
{
parentOrganism
.getLocalName
(
currentLocale
.language
)
!
""
}
($
{
hierarchyCategories
.getName
(
parentOrganism
.hierarchyCategoryId
)}
)</option>
</#if>
>$
{
parentOrganism
.latinName
!
""
}
/$
{
parentOrganism
.tradeName
!
""
}
/$
{
parentOrganism
.getLocalName
(
currentLocale
.language
)
!
""
}
($
{
hierarchyCategories
.getName
(
parentOrganism
.hierarchyCategoryId
)}
)</option>
</#if>
</#list>
</#list>
</select>
</select>
</div>
</div>
...
...
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