From 7c1a92cde1d5d1f9576e2c0a0cb5991e83a3d358 Mon Sep 17 00:00:00 2001
From: fuzzylogic2000 <katharina.albers@liqd.de>
Date: Wed, 7 Aug 2019 11:13:23 +0200
Subject: [PATCH 1/3] apps/projects: make sure project-list is replaced by
 plan-list everywhere

---
 meinberlin/apps/contrib/sitemaps/static_sitemap.py | 2 +-
 meinberlin/apps/organisations/models.py            | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

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')

From 80fb14bcb92ecd05c15a1f8d2075f93ec1f68a75 Mon Sep 17 00:00:00 2001
From: fuzzylogic2000 <katharina.albers@liqd.de>
Date: Wed, 7 Aug 2019 11:14:42 +0200
Subject: [PATCH 2/3] settings: update a4

---
 package.json          | 2 +-
 requirements/base.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2d7d5f4e3d..c2edcce271 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

From 51b5e6f9f2f71a7501f2a0252da7f47346cb6e9d Mon Sep 17 00:00:00 2001
From: fuzzylogic2000 <katharina.albers@liqd.de>
Date: Wed, 7 Aug 2019 11:21:24 +0200
Subject: [PATCH 3/3] templates/module tiles: show join now-button only for
 running modules

---
 .../meinberlin_projects/includes/project_module_tile.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ <h3 class="participation-tile__title">{{ module.name }}</h3>
                 </div>
                 {% endif %}
                 <div class="participation-tile__spacer"></div>
-                {% if not module.module_has_finished %}
+                {% if module.module_running_time_left %}
                 <div class="participation-tile__btn">
                     <a class="btn btn--full btn--small" href="{% url 'module-detail' module.slug %}">{% trans 'Join now' %}</a>
                 </div>