diff --git a/meinberlin/apps/contrib/sitemaps/static_sitemap.py b/meinberlin/apps/contrib/sitemaps/static_sitemap.py index b696e1ffac..f62c0be3e7 100644 --- a/meinberlin/apps/contrib/sitemaps/static_sitemap.py +++ b/meinberlin/apps/contrib/sitemaps/static_sitemap.py @@ -7,7 +7,7 @@ class StaticSitemap(Sitemap): priority = 0.8 def items(self): - return ["project-list"] + return ["plan-list"] def location(self, obj): return reverse(obj) diff --git a/meinberlin/apps/organisations/models.py b/meinberlin/apps/organisations/models.py index 38d67260ac..22703735f7 100644 --- a/meinberlin/apps/organisations/models.py +++ b/meinberlin/apps/organisations/models.py @@ -43,8 +43,4 @@ def has_initiator(self, user): return user in self.initiators.all() def get_absolute_url(self): - from django.utils.http import urlencode - return '%s?%s' % ( - reverse('project-list'), - urlencode({'organisation': self.pk}) - ) + return reverse('plan-list') diff --git a/meinberlin/apps/projects/templates/meinberlin_projects/includes/project_module_tile.html b/meinberlin/apps/projects/templates/meinberlin_projects/includes/project_module_tile.html index f71db707d6..a55ba52c26 100644 --- a/meinberlin/apps/projects/templates/meinberlin_projects/includes/project_module_tile.html +++ b/meinberlin/apps/projects/templates/meinberlin_projects/includes/project_module_tile.html @@ -33,7 +33,7 @@

{{ module.name }}

{% endif %}
- {% if not module.module_has_finished %} + {% if module.module_running_time_left %}
{% trans 'Join now' %}
diff --git a/package.json b/package.json index a03f5b1302..ddfd27b363 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@babel/preset-react": "7.0.0", "@fortawesome/fontawesome-free": "5.10.1", "acorn": "6.2.1", - "adhocracy4": "liqd/adhocracy4#mB-v2.2", + "adhocracy4": "liqd/adhocracy4#mB-v2.2.2", "autoprefixer": "9.6.1", "babel-loader": "8.0.6", "bootstrap": "4.3.1", diff --git a/requirements/base.txt b/requirements/base.txt index 0e969bace7..e11f1a0b91 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # A4 -git+git://github.com/liqd/adhocracy4.git@mB-v2.2#egg=adhocracy4 +git+git://github.com/liqd/adhocracy4.git@mB-v2.2.2#egg=adhocracy4 # Additional requirements bcrypt==3.1.7