gCubeSystem
/
grsf-publisher
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing service

This commit is contained in:
Luca Frosini 2024-04-03 12:44:18 +02:00
parent eabbd9968c
commit 88fad4a3d7
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/freemarker/Fishery.ftl
View File

@ -18,10 +18,9 @@
<@metadata key="Short Name" namespace=identity_namespace var=short_name />
<#if database_sources??>
<@metadatalist key="Database Source" namespace=identity_namespace list=database_sources />
<#if include_sensitive>
<#-- We are in Administrative VRE e.g. GRSF_Admin -->
<#if source = "grsf">
<#list database_sources as database_source>
<#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] >
<#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] >
</#list>
</#if>
</#if>

5
src/main/resources/freemarker/Stock.ftl
View File

@ -18,10 +18,9 @@
<@metadata key="Short Name" namespace=identity_namespace var=short_name />
<#if database_sources??>
<@metadatalist key="Database Source" namespace=identity_namespace list=database_sources />
<#if include_sensitive>
<#-- We are in Administrative VRE e.g. GRSF_Admin -->
<#if source = "grsf">
<#list database_sources as database_source>
<#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] >
<#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] >
</#list>
</#if>
</#if>

4
src/test/java/org/gcube/grsf/publisher/ContextTest.java
View File

@ -64,8 +64,8 @@ public class ContextTest {
ROOT_PROD = "/d4science.research-infrastructures.eu";
// DEFAULT_TEST_SCOPE = DEVVRE;
DEFAULT_TEST_SCOPE = VRE_GRSF_PRE;
DEFAULT_TEST_SCOPE = DEVVRE;
// DEFAULT_TEST_SCOPE = VRE_GRSF_PRE;
properties = new Properties();
InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(CONFIG_INI_FILENAME);

4
src/test/java/org/gcube/grsf/publisher/record/RecordTest.java
View File

@ -238,7 +238,7 @@ public class RecordTest extends ContextTest {
// maxTestRecords = 1;
int maxTestRecordsPerSource = Integer.MAX_VALUE;
// maxTestRecordsPerSource = 3;
maxTestRecordsPerSource = 5;
/*
* Tell if we want test the whole creation process;
@ -455,7 +455,7 @@ public class RecordTest extends ContextTest {
}
@Ignore
// @Test
@Test
public void testDeleteAll() throws Exception {
ContextTest.setContextByName(DEVVRE);