Download as
Browse Code »

Commit b6e871084862689e92ae4e63e14def9f2fd5a47f

Authored by Evandro Jr
2 parents bcf380e4 b1499fb9
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'virtuoso_integration' of gitlab.com:participa/noosfero into virtuoso_integration 

Conflicts:
	plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
Showing 5 changed files with 24 additions and 7 deletions   Show diff stats
plugins/virtuoso/lib/virtuoso_plugin/dspace_harvest.rb
  Diff comments   View file @b6e8710
... ... @@ -56,11 +56,11 @@ class VirtuosoPlugin::DspaceHarvest
56 56 def self.harvest_all(environment, from_start)
57 57 settings = Noosfero::Plugin::Settings.new(environment, VirtuosoPlugin)
58 58 if settings.dspace_servers.present?
59   - settings.dspace_servers.each do |k, v|
  59 + settings.dspace_servers.each do |k, v|
60 60 harvest = VirtuosoPlugin::DspaceHarvest.new(environment, k[:dspace_uri])
61 61 harvest.start(from_start)
62 62 end
63   - end
  63 + end
64 64 end
65 65  
66 66 def start(from_start = false)
... ...
plugins/virtuoso/lib/virtuoso_plugin/triples_template.rb
  Diff comments   View file @b6e8710
... ... @@ -28,7 +28,7 @@ class VirtuosoPlugin::TriplesTemplate < Article
28 28 def to_html(options = {})
29 29 article = self
30 30 proc do
31   - render :file => 'content_viewer/triples_template', :locals => {:article => article}
  31 + render :file => 'content_viewer/triples_template', :locals => {:article => article, :page => params[:npage]}
32 32 end
33 33 end
34 34  
... ... @@ -36,11 +36,18 @@ class VirtuosoPlugin::TriplesTemplate < Article
36 36 @plugin ||= VirtuosoPlugin.new(self)
37 37 end
38 38  
  39 + attr_reader :results
  40 +
39 41 def template_content(page=1)
40 42 begin
41   - results = plugin.virtuoso_readonly_client.query(query).paginate({:per_page => per_page, :page => page})
  43 + @results ||= plugin.virtuoso_readonly_client.query(query).paginate({:per_page => per_page, :page => page})
42 44 liquid_template = Liquid::Template.parse(template)
43   - rendered_template = liquid_template.render('results' => results)
  45 + rendered_template = liquid_template.render('results' => results,
  46 + 'total_pages' => results.total_pages,
  47 + 'current_page' => results.current_page,
  48 + 'per_page' => results.per_page,
  49 + 'total_entries' => results.total_entries,
  50 + 'page_offset' => (results.current_page-1)*results.per_page)
44 51 transform_html(rendered_template)
45 52 rescue => ex
46 53 logger.info ex.to_s
... ...
plugins/virtuoso/public/virtuoso_plugin_admin.css
  Diff comments   View file @b6e8710
... ... @@ -5,4 +5,8 @@
5 5  
6 6 #dspace-new-template{
7 7 display: none;
8   -}
9 8 \ No newline at end of file
  9 +}
  10 +
  11 +.virtuoso-manage-custom-queries textarea {
  12 + width: 90%;
  13 +}
... ...
plugins/virtuoso/views/content_viewer/triples_template.html.erb
  Diff comments   View file @b6e8710
... ... @@ -3,5 +3,7 @@
3 3 </div>
4 4  
5 5 <div class="results">
6   - <%= article.template_content %>
  6 + <%= article.template_content(page) %>
7 7 </div>
  8 +
  9 +<%= will_paginate(article.results, :param_name => 'npage')%>
... ...
plugins/virtuoso/views/virtuoso_plugin_custom_queries/_form.html.erb
  Diff comments   View file @b6e8710
  1 +<link rel="stylesheet" type="text/css" href="/plugins/virtuoso/virtuoso_plugin_admin.css">
  2 +
  3 +<div class="virtuoso-manage-custom-queries">
1 4 <%= form_for(:custom_query, :url => {:action => @custom_query.persisted? ? :update : :create, :id => @custom_query.id}) do |f| %>
2 5 <% if @custom_query.errors.any? %>
3 6 <div id="error_explanation">
... ... @@ -35,3 +38,4 @@
35 38 <%= f.submit %>
36 39 </div>
37 40 <% end %>
  41 +</div>
... ...