Merge branch 'master' of https://github.com/AuScope/ckan-docker into …

…dev-data

.github/workflows/release-tag-based.yml

@@ -7,6 +7,10 @@ on:
         description: 'Release Type (patch/minor/major)'
         required: true
         default: 'patch'
+      appName:
+        description: 'Application Name (data/sample)'
+        required: true
+        default: 'data'
     branches:
       - master
       - release/*
@@ -104,8 +108,8 @@ jobs:
       - name: Pull 'latest' Docker image
         run: docker pull ghcr.io/auscope/auscope-ckan:latest
 
-      - name: Tag Docker image with new version
-        run: docker tag ghcr.io/auscope/auscope-ckan:latest ghcr.io/auscope/auscope-ckan:${{ needs.prepare-release.outputs.new-version }}
+      - name: Tag Docker image with new version and AppName
+        run: docker tag ghcr.io/auscope/auscope-ckan:latest ghcr.io/auscope/auscope-ckan:${{ github.event.inputs.AppName }}-${{ needs.prepare-release.outputs.new-version }}
 
       - name: Push Docker image with new version
-        run: docker push ghcr.io/auscope/auscope-ckan:${{ needs.prepare-release.outputs.new-version }}
+        run: docker push ghcr.io/auscope/auscope-ckan:${{ github.event.inputs.AppName }}-${{ needs.prepare-release.outputs.new-version }}

ckan/setup.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 0.2.3
+current_version = 0.2.6
 commit = True
 tag = True

ckan/src/ckanext-auscope-theme/ckanext/auscope_theme/data_repository_schema.yaml

@@ -63,7 +63,8 @@ dataset_fields:
       label: Author Affiliation Identifier
       required: true    
       display_snippet: None
-      help_text: The persistent identifier of the affiliated entity. Please specify the absolute URL, e.g. https://ror.org/03qn8fb07
+      help_text: "The persistent identifier of the affiliated entity. Please specify the absolute URL, e.g. <code> https://ror.org/03qn8fb07</code>"
+      help_allow_html: true
 
     - field_name: author_affiliation_identifier_type
       label: Author Affiliation Identifier Type
@@ -107,8 +108,9 @@ dataset_fields:
     - field_name: author_identifier
       label: Author Identifier
       display_snippet: URL
-      help_text: Uniquely identifies an individual or legal entity, according to identifier schemes. Please specify the absolute URL, e.g. https:&#47;&#47;:&#47;&#47;orcid.org/0000-0003-0870-3192
-
+      help_text: "Uniquely identifies an individual or legal entity, according to identifier schemes. Please specify the absolute URL, e.g. <code>https://orcid.org/0000-0003-0870-3192</code>"
+      help_allow_html: true
+
     - field_name: author_email
       label: Author Email
       required: true
@@ -279,7 +281,8 @@ dataset_fields:
     - field_name: funder_identifier
       label: Funder Identifier
       display_snippet: URL
-      help_text: 'Unique identifier of the funding entity. Please specify the absolute URL, e.g. http:&#47;&#47;dx.doi.org/10.13039/501100000923'
+      help_text: "Unique identifier of the funding entity. Please specify the absolute URL, e.g. <code> http://dx.doi.org/10.13039/501100000923 </code>"
+      help_allow_html: true
 
     - field_name: funder_identifier_type
       label: Funder Identifier Scheme
@@ -306,7 +309,8 @@ dataset_fields:
     - field_name: project_identifier
       label: Project Identifier
       display_snippet: URL
-      help_text: The code assigned by the funder to a sponsored grant or project of the dataset. Please specify the absolute URL, e.g. https:&#47;&#47;://dataportal.arc.gov.au/NCGP/Web/Grant/Grant/IM240100006
+      help_text: "The code assigned by the funder to a sponsored grant or project of the dataset. Please specify the absolute URL, e.g. <code> https://dataportal.arc.gov.au/NCGP/Web/Grant/Grant/IM240100006</code>"
+      help_allow_html: true
 
     - field_name: project_name
       label: Project Name

ckan/src/ckanext-auscope-theme/ckanext/auscope_theme/logic/action.py

@@ -114,6 +114,13 @@ def user_invite(next_action, context, data_dict):
     return next_action(context, data_dict)
 
 
+@tk.chained_action
+def user_invite(next_action, context, data_dict):
+    email = data_dict.get('email', '').lower()
+    data_dict['email'] = email
+    return next_action(context, data_dict)
+
+
 def get_actions():
     return {
         'user_create': user_create,

ckan/src/ckanext-auscope-theme/ckanext/auscope_theme/templates/scheming/form_snippets/org_visibility.html

@@ -22,7 +22,7 @@
 
     <select id="field-organizations" name="owner_org" style="display:none;">
 	{# Need to get this from config  #}
-        <option value="12345678-1234-1234-1234-123456789012"></option>
+        <option value="auscope"></option>
     </select>
 
     {% block package_metadata_fields_visibility %}

ckan/src/shared/public/shared_style.css

@@ -810,4 +810,11 @@ body {
   height: 32.5px; 
   margin: -14px 0 0 -14px; 
   font: normal;
-}
+}
+
+.form-group .info-block code  {
+    font-size: 0.875em;
+    color: #6e6e6e;
+    word-wrap: break-word;
+}
+

ckan/src/shared/templates/scheming/form_snippets/subfield_snippets/composite_help_text.html

@@ -0,0 +1,16 @@
+{% macro envidat_info(text='', inline=false, classes=[]) %}
+  {%- if text -%}
+    <div class="info-block {{ " " ~ classes | join(' ') }}">
+      <i class="fa fa-info-circle"></i>
+      {{ text|safe if field.get('help_allow_html', false) else text|e }}
+    </div>
+  {%- endif -%}
+{% endmacro %}
+
+{%- if field.help_text -%}
+    {%- set text = h.scheming_language_text(field.help_text) %}
+    {{- envidat_info(
+        text=text,
+        inline=field.get('help_inline', false), classes=["composite-subfield-info"]
+        ) -}}
+{%- endif -%}