Merge pull request #2453 from liqd/ka-2019-08-make-sure-project-list-…

…not-used-anymore

Ka 2019 08 make sure project list not used anymore

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)

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

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>

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",

requirements/base.txt

@@ -1,5 +1,5 @@
 # A4
-git+git://github.com/liqd/[email protected]#egg=adhocracy4
+git+git://github.com/liqd/[email protected].2#egg=adhocracy4
 
 # Additional requirements
 bcrypt==3.1.7