From d7aafc1fdd80d5bcb321621dbf65e9def17a2536 Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Sat, 12 May 2018 13:02:18 +0100
Subject: [PATCH] More fixes

---
 ckan/templates-bs2/package/activity.html      |  8 ++-
 .../package/snippets/resource_item.html       |  2 +-
 ckan/templates-bs2/user/activity_stream.html  |  9 +--
 .../functional/api/model/test_revisions.py    | 63 -------------------
 4 files changed, 8 insertions(+), 74 deletions(-)
 delete mode 100644 ckan/tests/legacy/functional/api/model/test_revisions.py

diff --git a/ckan/templates-bs2/package/activity.html b/ckan/templates-bs2/package/activity.html
index 9150b954233..057b17fec6d 100644
--- a/ckan/templates-bs2/package/activity.html
+++ b/ckan/templates-bs2/package/activity.html
@@ -3,6 +3,10 @@
 {% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  <h1 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h1>
-  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream %}
+  <h1 class="hide-heading">
+    {% block page_heading %}
+      {{ _('Activity Stream') }}
+    {% endblock %}
+  </h1>
+  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='package' %}
 {% endblock %}
diff --git a/ckan/templates-bs2/package/snippets/resource_item.html b/ckan/templates-bs2/package/snippets/resource_item.html
index d93cc6b5e47..648cb3d6040 100644
--- a/ckan/templates-bs2/package/snippets/resource_item.html
+++ b/ckan/templates-bs2/package/snippets/resource_item.html
@@ -1,5 +1,5 @@
 {% set url_action = 'resource_edit' if url_is_edit and can_edit else 'resource_read' %}
-{% set url = h.url_for(controller='package', action=url_action, id=pkg.name, resource_id=res.id, **({'activity_id': request.params['activity_id']} if 'activity_id' in request.params else {}))) %}
+{% set url = h.url_for(controller='package', action=url_action, id=pkg.name, resource_id=res.id, **({'activity_id': request.params['activity_id']} if 'activity_id' in request.params else {})) %}
 
 <li class="resource-item" data-id="{{ res.id }}">
   {% block resource_item_title %}
diff --git a/ckan/templates-bs2/user/activity_stream.html b/ckan/templates-bs2/user/activity_stream.html
index e84899427ba..45388432578 100644
--- a/ckan/templates-bs2/user/activity_stream.html
+++ b/ckan/templates-bs2/user/activity_stream.html
@@ -3,17 +3,10 @@
 {% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-<<<<<<< HEAD
   <h1 class="hide-heading">
     {% block page_heading -%}
       {{ _('Activity Stream') }}
     {%- endblock %}
   </h1>
-  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='user' %}
-=======
-  <h2 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h2>
-  {% block activity_stream %}
-    {{ g.user_activity_stream | safe }}
-  {% endblock %}
->>>>>>> master
+  {% snippet 'snippets/activity_stream.html', activity_stream=user_activity_stream, id=id, object_type='user' %}
 {% endblock %}
diff --git a/ckan/tests/legacy/functional/api/model/test_revisions.py b/ckan/tests/legacy/functional/api/model/test_revisions.py
deleted file mode 100644
index d08375360e9..00000000000
--- a/ckan/tests/legacy/functional/api/model/test_revisions.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# encoding: utf-8
-
-from nose.tools import assert_equal
-
-from ckan import model
-from ckan.lib.create_test_data import CreateTestData
-
-from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase
-
-
-class RevisionsTestCase(BaseModelApiTestCase):
-
-    @classmethod
-    def setup_class(cls):
-        CreateTestData.create()
-        cls.user_name = u'annafan' # created in CreateTestData
-        cls.init_extra_environ(cls.user_name)
-
-    @classmethod
-    def teardown_class(cls):
-        model.repo.rebuild_db()
-
-    def test_register_get_ok(self):
-        # Comparison list - newest first
-        revs = model.Session.query(model.Revision).\
-               order_by(model.Revision.timestamp.desc()).all()
-        assert revs
-
-        # Check list of revisions
-        offset = self.revision_offset()
-        res = self.app.get(offset, status=200)
-        revs_result = self.data_from_res(res)
-
-        assert_equal(revs_result, [rev.id for rev in revs])
-
-    def test_entity_get_ok(self):
-        rev = model.repo.history().all()[0] # newest revision is the creation of pkgs
-        assert rev.id
-        assert rev.timestamp.isoformat()
-        offset = self.revision_offset(rev.id)
-        response = self.app.get(offset, status=[200])
-        response_data = self.data_from_res(response)
-        assert_equal(rev.id, response_data['id'])
-        assert_equal(rev.timestamp.isoformat(), response_data['timestamp'])
-        assert 'packages' in response_data
-        packages = response_data['packages']
-        assert isinstance(packages, list)
-        #assert len(packages) != 0, "Revision packages is empty: %s" % packages
-        assert self.ref_package(self.anna) in packages, packages
-        assert self.ref_package(self.war) in packages, packages
-
-    def test_entity_get_404(self):
-        revision_id = "xxxxxxxxxxxxxxxxxxxxxxxxxx"
-        offset = self.revision_offset(revision_id)
-        res = self.app.get(offset, status=404)
-        self.assert_json_response(res, 'Not found')
-
-    def test_entity_get_301(self):
-        # see what happens when you miss the ID altogether
-        revision_id = ''
-        offset = self.revision_offset(revision_id)
-        res = self.app.get(offset, status=301)
-        # redirects "/api/revision/" to "/api/revision"