From e26c17d1d6a86f15f925b93a53ab094ca5b90239 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Tue, 11 Nov 2014 11:00:16 -0300 Subject: [PATCH] virtuoso: fix template content --- plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb | 5 +++-- plugins/virtuoso/views/cms/virtuoso_plugin/_triples_template.html.erb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb b/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb index 455baa1..5c4bd76 100644 --- a/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb +++ b/plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb @@ -25,8 +25,9 @@ class VirtuosoPlugin::TriplesTemplate < Article end def template_content - plugin.virtuoso_client.query(query).map do |r| - template % r + result = plugin.virtuoso_client.query(query) + result.map do |r| + template.gsub(/%\{.*\}/) {|s| r["#{s.delete('%|{|}')}"]} end.join end diff --git a/plugins/virtuoso/views/cms/virtuoso_plugin/_triples_template.html.erb b/plugins/virtuoso/views/cms/virtuoso_plugin/_triples_template.html.erb index e25b895..18976d7 100644 --- a/plugins/virtuoso/views/cms/virtuoso_plugin/_triples_template.html.erb +++ b/plugins/virtuoso/views/cms/virtuoso_plugin/_triples_template.html.erb @@ -6,5 +6,5 @@ <%= labelled_form_field(_('SPARQL Query'), text_area(:article, :query, :style => 'width: 98%; height: 120px;')) %> <%= labelled_form_field(_('Template'), text_area(:article, :template, :style => 'width: 98%; height: 200px;', :class => 'mceEditor')) %> -<%= render :partial => 'general_fields' %> <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %> +<%= render :partial => 'general_fields' %> -- libgit2 0.21.2