Skip to content

Commit 834ca94

Browse files
tcnicholrobkooper
andauthored
fixed - add dataset to collection (#307)
* needed a null for there being no 'when' sent in * fix wrong DOI * add missing people and grant to zenodo Co-authored-by: Rob Kooper <[email protected]>
1 parent ddf246a commit 834ca94

File tree

7 files changed

+42
-7
lines changed

7 files changed

+42
-7
lines changed

.zenodo.json

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,35 @@
146146
"affiliation": "National Center for Supercomputing Applications, University of Illinois at Urbana-Champaign",
147147
"name": "Kenton McHenry",
148148
"orcid": "0000-0003-0367-2550"
149+
},
150+
{
151+
"affiliation": "National Center for Supercomputing Applications, University of Illinois at Urbana-Champaign",
152+
"name": "Aaraj Habib"
153+
},
154+
{
155+
"affiliation": "National Center for Supercomputing Applications, University of Illinois at Urbana-Champaign",
156+
"name": "Ben Galewsky"
157+
},
158+
{
159+
"name": "Chrysovalantis Constantinou"
160+
},
161+
{
162+
"affiliation": "National Center for Supercomputing Applications, University of Illinois at Urbana-Champaign",
163+
"name": "Kaveh Karimi-Asli"
164+
},
165+
{
166+
"name": "Maria-Spyridoula Tzima"
167+
},
168+
{
169+
"affiliation": "National Center for Supercomputing Applications, University of Illinois at Urbana-Champaign",
170+
"name": "Michael Johnson"
171+
},
172+
{
173+
"affiliation": "National Center for Supercomputing Applications, University of Illinois at Urbana-Champaign",
174+
"name": "Mike Bobak"
175+
},
176+
{
177+
"name": "Tim Yardley"
149178
}
150179
],
151180
"upload_type": "software",
@@ -158,5 +187,5 @@
158187
"open-data",
159188
"open-science"
160189
],
161-
"notes": "This research has been partially funded by grants: NSF #BCS-0941268, #EAR- 331906, #ACI-1261582, #ACI-1443013, #OCI-0940824, #OCI-0525308; NIH #1P01AI089556-01A1. Illinois - Indiana Sea Grant #DW92329201, European Commission #RI-261600, XSEDE #OCI-1053575, ARPA- E #DE-AR0000594."
162-
}
190+
"notes": "This research has been partially funded by grants: NSF #BCS-0941268, #EAR- 331906, #ACI-1261582, #ACI-1443013, #OCI-0940824, #OCI-0525308, #OAC-1835834; NIH #1P01AI089556-01A1. Illinois - Indiana Sea Grant #DW92329201, European Commission #RI-261600, XSEDE #OCI-1053575, ARPA- E #DE-AR0000594."
191+
}

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## 1.19.4 - 2021-11-11
8+
9+
### Fixed
10+
- Error with adding dataset to collection. [#306](https://github.com/clowder-framework/clowder/issues/306)
11+
712
## 1.19.3 - 2021-11-11
813

914
See [fix-counts.js](scripts/updates/fix-count.js) for a script that can be run before this update (as well as the

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Clowder: Open Source Data Management for Long Tail Data
22

3-
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1196568.svg)](https://doi.org/10.5281/zenodo.1196568)
3+
[![DOI](https://zenodo.org/badge/196635389.svg)](https://zenodo.org/badge/latestdoi/196635389)
4+
45

56
A customizable and scalable data management system you can install in the cloud or on your own hardware.
67
More information is available at [https://clowderframework.org/](https://clowderframework.org/).

app/views/datasets/collections.scala.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ <h4>@Messages("a.contains.b", Messages("collections.title"), Messages("dataset.t
7474
allowClear: true,
7575
ajax: {
7676
url: function(params) {
77-
return jsRoutes.api.Collections.addDatasetToCollectionOptions("@dataset.id", params.term, null, 5).url;
77+
return jsRoutes.api.Collections.addDatasetToCollectionOptions(null, "@dataset.id", params.term, null, 5).url;
7878
},
7979
data: function(params) {
8080
return { title: params.term };

doc/src/sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'Luigi Marini'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '1.19.3'
25+
release = '1.19.4'
2626

2727

2828
# -- General configuration ---------------------------------------------------

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import NativePackagerKeys._
1313
object ApplicationBuild extends Build {
1414

1515
val appName = "clowder"
16-
val version = "1.19.3"
16+
val version = "1.19.4"
1717
val jvm = "1.7"
1818

1919
def appVersion: String = {

public/swagger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ info:
99
Clowder is a customizable and scalable data management system to support any
1010
data format and multiple research domains. It is under active development
1111
and deployed for a variety of research projects.
12-
version: 1.19.3
12+
version: 1.19.4
1313
termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
1414
contact:
1515
name: Clowder

0 commit comments

Comments
 (0)