Work on data previews

ilarimikkonen · Oct 23, 2017 · 87daeb3 · 87daeb3
1 parent c57fc31
commit 87daeb3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/ansible/roles/ckan/templates/ckan.ini.j2 b/ansible/roles/ckan/templates/ckan.ini.j2
@@ -72,6 +72,8 @@ smtp.server = {{ email_domain_access }}
 smtp.starttls = False
 smtp.mail_from = no-reply
 
+ckan.views.default_views = recline_grid_view
+
 ckanext.ytp.drupal.connection = postgres://{{ postgres.users.drupal.username }}:{{ postgres.users.drupal.password }}@{{ postgres.server.host }}/{{ postgres.databases.drupal.name }}
 
 ckan.harvest.mq.type = redis
@@ -152,6 +154,8 @@ ckan.max_resource_size = {{ ckan_max_resource_size }}
 
 ckanext.ytp.theme.show_postit_demo = {{ show_postit_demo }}
 
+ckan.datapusher.url = http://127.0.0.1:8800/
+
 [loggers]
 
 keys = root, ckan, ckanext

diff --git a/ansible/roles/ckan/vars/main.yml b/ansible/roles/ckan/vars/main.yml
@@ -7,7 +7,7 @@ celery_user: "{{ www_user }}"
 
 ckan_plugins_default: stats
 # order matters, when templates call super()
-ckan_plugins: multilingual_dataset harvest ckan_harvester hri_harvester dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface spatial_metadata spatial_query csw_harvester drupal7 datarequests report qa archiver ytp_organizations ytp_comments ytp_request hierarchy_display ytp_theme ytp_drupal ytp_tasks ytp_dataset ytp_user ytp_service datastore showcase
+ckan_plugins: multilingual_dataset harvest ckan_harvester hri_harvester dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface spatial_metadata spatial_query csw_harvester drupal7 datarequests report qa archiver ytp_organizations ytp_comments ytp_request hierarchy_display ytp_theme ytp_drupal ytp_tasks ytp_dataset ytp_user ytp_service datastore showcase datapusher recline_grid_view
 
 ckan_aws_plugins: cloudstorage
 

diff --git a/modules/ckanext-showcase b/modules/ckanext-showcase
diff --git a/modules/ckanext-ytp-main/ckanext/ytp/dataset/templates/package/resource_edit_base.html b/modules/ckanext-ytp-main/ckanext/ytp/dataset/templates/package/resource_edit_base.html
@@ -4,5 +4,5 @@
   {% if 'datapusher' in g.plugins %}
     {{ h.build_nav_icon('resource_data', _('DataStore'), id=pkg.name, resource_id=res.id) }}
   {% endif %}
-    {#YH-743: {{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }}#}
-{% endblock %}
+    {{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }}
+{% endblock %}
diff --git a/modules/ckanext-ytp-main/ckanext/ytp/dataset/templates/package/resource_read.html b/modules/ckanext-ytp-main/ckanext/ytp/dataset/templates/package/resource_read.html
@@ -19,9 +19,9 @@
   <li class="active"><a href="">{{ h.resource_display_name(res)| truncate(30) }}</a></li>
 {% endblock %}
 
-{% block pre_primary %}
+{#{% block pre_primary %}
 
-{% endblock %}
+{% endblock %}#}
 
 {% block primary_content %}
   {% block resource %}
@@ -80,9 +80,6 @@ <h3>{{ _('From the dataset abstract') }}</h3>
         {% endblock %}
         </div>
       </div>
-      {% block data_preview %}
-        {# Data preview is disabled due to bugs and problems with preview extensions, and because they add little value. #}
-      {% endblock %}
     </section>
   {% endblock %}
   {% block resource_additional_information %}