More fixes

ckan · May 12, 2018 · d7aafc1 · d7aafc1
1 parent 24819e7
commit d7aafc1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 74 deletions.
diff --git 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
@@ -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
@@ -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