Commit f595c3c5 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '192-ability-to-save-empty-list-of-accessions' into 'master'

Ability to save empty list of accessions

Closes #192

See merge request genesys-pgr/genesys-server!106
parents c174cd2b ae53a395
......@@ -344,7 +344,11 @@ public class SelectionController extends BaseController {
accessionListService.setList(accessionList, selectionBean.copy());
selectionBean.setUserAccessionList(UserAccessionList.from(accessionList));
redirectAttrs.addFlashAttribute("resultFromSave", "user.accession.list.saved-updated");
if (selectionBean.getAccessionIds().size() > 0) {
redirectAttrs.addFlashAttribute("resultFromSave", "user.accession.list.saved-updated");
} else {
redirectAttrs.addFlashAttribute("resultFromSave", "user.accession.list.empty-saved");
}
return "redirect:/sel/";
}
......
......@@ -73,7 +73,7 @@ save=Save
create=Create
cancel=Cancel
delete=Delete
prompt.confirm-delete=Should we really delete the selected record?
prompt.confirm-delete=Should we really delete the selected record?
prompt.loading-data=Loading data from Genesys...
prompt.loading-data-failed=Failed to load data. Please retry.
......@@ -269,12 +269,12 @@ accession.mlsStatus=MLS Status
accession.duplSite=Safety duplication institute
accession.inSvalbard=Safety duplicated in Svalbard
accession.inTrust.true=This accession is under Article 15 of the International Treaty on Plant Genetic Resources for Food and Agriculture.
accession.mlsStatus.true=This accession is in the Multilateral System of the ITPGRFA.
accession.mlsStatus.true=This accession is in the Multilateral System of the ITPGRFA.
accession.inSvalbard.true=Safety duplicated in Svalbard Global Seed Vault.
accession.not-available-for-distribution=The accession is NOT available for distribution.
accession.this-is-a-historic-entry=This is a historic record of an accession.
accession.historic=Historic entry
accession.available-for-distribution=The accession is available for distribution.
accession.available-for-distribution=The accession is available for distribution.
accession.elevation=Elevation
accession.geolocation=Geolocation (lat, long)
......@@ -379,7 +379,7 @@ accession.scientificName=Scientific name
accession.page.profile.title=Accession profile: {0}
accession.page.resolve.title=Multiple accessions found
accession.resolve=Multiple accessions with the name ''{0}'' found in Genesys. Select one from the list.
accession.resolve=Multiple accessions with the name ''{0}'' found in Genesys. Select one from the list.
accession.page.data.title=Accession browser
accession.page.data.intro=Explore the accession data with Genesys. To refine your search, add filters such as country of origin, crop, species, or the latitude and longitude of the collecting site.
accession.taxonomy-at-institute=View {0} at {1}
......@@ -472,7 +472,7 @@ filter.apply=Apply
filter.close=Close
filter.remove=Remove filter
filter.autocomplete-placeholder=Type more than 3 characters...
filter.coll.collMissId=Collecting mission ID
filter.coll.collMissId=Collecting mission ID
filter.storage=Type of Germplasm storage
filter.string.equals=Equals
filter.string.like=Starts with
......@@ -549,8 +549,9 @@ article.transifex-failed=An error occured while exchanging data with Transifex
article.translations-updated=Resource successfully updated with translated data!
article.share=Share this article
user.accession.list.saved-updated=Your list of accessions successful saved.
user.accession.list.deleted=Your list of accessions successful deleted from server.
user.accession.list.saved-updated=Your list of accessions is successfully saved.
user.accession.list.empty-saved=Your empty list of accessions is saved.
user.accession.list.deleted=Your list of accessions successfully deleted from server.
user.accession.list.create-update=Save
user.accession.list.delete=Delete
user.accession.list.title=Accession List
......@@ -573,7 +574,7 @@ oauth2.confirm-client=You, <b>{0}</b>, hereby authorize <b>{1}</b> to access you
oauth2.button-approve=Yes, allow access
oauth2.button-deny=No, deny access
oauth2.authorization-code=Authorization code
oauth2.authorization-code-instructions=Copy this authorization code:
oauth2.authorization-code-instructions=Copy this authorization code:
# Scope
oauth.allow-access=Allow access
......@@ -794,7 +795,7 @@ accession.acqDate=Acquisition date
accession.acceName=Accession name
accession.svalbard-data.url=Svalbard database URL
accession.svalbard-data.url-title=Deposit information in SGSV database
accession.svalbard-data.url-title=Deposit information in SGSV database
accession.svalbard-data.url-text=View SGSV deposit information for {0}
filter.download-pdci=Download PDCI data
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment