Skip to content

Conversation

@jochenklar
Copy link
Member

@jochenklar jochenklar commented Nov 14, 2024

This is the development branch for RDMO 2.3.0 🚧👷💥.

Changelog 📔

Breaking Changes ⚠️

Maintenance 🛠️

Important changes to templates 🔧

In RDMO 2.3.0, we made changes to the core/base.html template. If changed this file in you local theme you need to update it accordingly. At the top, the current language is set at an attribute to <html>:

{% load static compress core_tags i18n %}{% get_current_language as lang_code %}<!DOCTYPE html>
<html lang="{{ lang_code }}">

The {% block vendor %} needs to be removed.

The {% block css %} now looks like this:

    {% block css %}
    <link rel="stylesheet" href="{% static 'core/css/base.css' %}" />

    {% compress css %}
    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/base.scss' %}" />
    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/fonts.scss' %}" />
    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/footer.scss' %}" />

    <link rel="stylesheet" type="text/x-scss" href="{% static 'core/css/style.scss' %}" />
    {% endcompress %}

    {% endblock %}

And the {% block js %} now looks like this:

    {% block js %}
    <script src="{% url 'javascript-catalog' %}"></script>
    <script src="{% static 'core/js/base.js' %}"></script>
    {% endblock %}

See https://github.com/rdmorganiser/rdmo/blob/2.3.0/rdmo/core/templates/core/base.html for the file in the 2.3.0 branch.

We also changed slightly changed the projects/project_detail_sidebar.html template. If changed this file in you local theme you need to update it and change the url name project_question to project_interview:

...
<ul class="list-unstyled">
    <li id="project-questions">
        <strong>
            {% if can_change_value %}
            <a href="{% url 'project_interview' project.pk %}">{% trans 'Answer questions' %}</a>
            {% else %}
            <a href="{% url 'project_interview' project.pk %}">{% trans 'View questions' %}</a>
            {% endif %}
        </strong>
    </li>
</ul>
...

@jochenklar jochenklar self-assigned this Nov 14, 2024
@jochenklar jochenklar added this to the RDMO 2.3.0 milestone Nov 14, 2024
@jochenklar jochenklar changed the title RDMO 2.3.0 RDMO 2.3.0 ⭐ Nov 14, 2024
@coveralls
Copy link

coveralls commented Nov 14, 2024

Coverage Status

coverage: 90.534% (+0.06%) from 90.478%
when pulling 6d6279d on 2.3.0
into 1eadee5 on main.

MyPyDavid and others added 18 commits February 17, 2025 15:41
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
…leware

Feat: add Terms of Use accept view and middleware
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
jochenklar and others added 3 commits February 20, 2025 13:25
…es-in-the-german-rdmo

Fix typos in German localisation
…d-tasks

signal handlers for syncing of project views and tasks 
Related issues: #966, #1198, #345, #431
…o-rdmo-xml-exports

Add minimum required version to rdmo xml exports and check at import
Related issue: #1205
jochenklar and others added 20 commits April 7, 2025 14:35
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
build(pyproject): remove django-rest-swagger #698
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
Fix copySet action in interview by properly resolving conditions
…e-tests

2.3.0 fix local storage + e2e tests
chore: group rdmo extras in dev
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
@jochenklar jochenklar marked this pull request as ready for review April 10, 2025 11:48
@jochenklar jochenklar requested a review from MyPyDavid April 11, 2025 12:38
@MyPyDavid
Copy link
Member

so close now.. 😅

@jochenklar
Copy link
Member Author

Always one more commit.

Copy link
Member

@MyPyDavid MyPyDavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still curious what the test coverage will be.. 🛸

@jochenklar jochenklar merged commit 1d29d96 into main Apr 11, 2025
18 checks passed
@jochenklar jochenklar deleted the 2.3.0 branch April 11, 2025 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants