Merge pull request #20 from tum-gis/release1.1.4

Release 1.1.4

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 For releases `< 1.0.0` minor version steps may indicate breaking changes too.
 
+## [1.1.4] - 2024-04-17
+### Removed
+Removed "Remember me" button on the login page mentioned [here](https://github.com/tum-gis/ckan-docker/pull/40)
+### Fixed
+- Fixing the missing variables for personalization of the main page
+- Repair the view of the dataset added by the organization on the main page
+
 ## [1.1.3] - 2023-10-13
 ### Added
 Reducing the number of emails sent for the "Forgot your password?" function
@@ -80,6 +87,7 @@ This Release of the CKAN extension is intended to be used in combination with th
 ### Known issues
 
 [Unreleased]: https://github.com/tum-gis/ckanext-grouphierarchy-sddi/compare/0.0.5...HEAD
+[1.1.4]: https://github.com/tum-gis/ckanext-grouphierarchy-sddi/compare/1.1.3...1.1.4
 [1.1.3]: https://github.com/tum-gis/ckanext-grouphierarchy-sddi/compare/1.1.2...1.1.3
 [1.1.2]: https://github.com/tum-gis/ckanext-grouphierarchy-sddi/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/tum-gis/ckanext-grouphierarchy-sddi/compare/1.1.0...1.1.1

ckanext/grouphierarchy/plugin.py

@@ -38,6 +38,18 @@ def get_actions(self):
             "user_update": action.user_update,
         }
 
+    def update_config_schema(self, schema):
+        ignore_missing = p.toolkit.get_validator(u'ignore_missing')
+        unicode_safe = p.toolkit.get_validator(u'unicode_safe')
+
+        schema.update({
+            u'ckan.site_intro_paragraph': [ignore_missing, unicode_safe],
+            u'ckan.background_image': [ignore_missing, unicode_safe],
+            u'image_upload': [ignore_missing, unicode_safe],
+            u'clear_image_upload': [ignore_missing, unicode_safe],
+        })
+        return schema
+
     # ITemplateHelpers
 
     def get_helpers(self):

ckanext/grouphierarchy/templates/snippets/organization_item.html

@@ -26,7 +26,7 @@ <h2 style="color: white; border: 10px">
                 <img alt="{{org.title}}" src="{{ org_image }}" style="position:relative;bottom: 6px;">
             </a>
             <h3 class="media-heading">
-                <a href="{{ h.url_for('organization.read', id=org.name) }}">{{ _(h.render_markdown(org.display_name)) }}</a>
+                <a href="{{ h.url_for('organization.read', id=org.name) }}">{{ _(org.display_name) }}</a>
             </h3>
         </header>
 
@@ -36,9 +36,11 @@ <h3 class="media-heading">
                 <div class="dataset-content">
                     <div class="dataset-content">
                         <h3 class="dataset-heading">
-                            <a href="{{ h.url_for('dataset.read', id=pkg.name) }}">{{ _(pkg.name|capitalize) }}</a>
+                            <a href="{{ h.url_for('dataset.read', id=pkg.name) }}">{{ _(pkg.title) }}</a>
                         </h3>
-                        <div>{{ h.dataset_display_name(pkg) }}</div>
+                        {% set truncate = truncate or 180 %}
+                        {% set notes = h.markdown_extract(pkg.notes, extract_length=truncate) %}
+                        <div>{{ notes }}</div>
                     </div>
                 </div>
             </li>

ckanext/grouphierarchy/templates/user/snippets/login_form.html

@@ -0,0 +1,29 @@
+{#
+Renders the login form.
+
+action        - The url that the form should be submitted to.
+error_summary - A tuple/list of form errors.
+
+Example:
+
+  {% snippet "user/snippets/login_form.html", action=g.login_handler, error_summary=error_summary %}
+
+#}
+{% import 'macros/form.html' as form %}
+
+{% set username_error = true if error_summary %}
+{% set password_error = true if error_summary %}
+
+<form action="{{ action }}" method="post">
+  {{ form.errors(errors=error_summary) }}
+
+  {{ form.input('login', label=_("Username"), id='field-login', value="", error=username_error, classes=["control-medium"]) }}
+
+  {{ form.input('password', label=_("Password"), id='field-password', type="password", value="", error=password_error, classes=["control-medium"]) }}
+
+  <div class="form-actions">
+    {% block login_button %}
+    <button class="btn btn-primary" type="submit">{{ _('Login') }}</button>
+    {% endblock %}
+  </div>
+</form>