From ee1de93724dbf4f81bf61742bd9798487bd5e3d0 Mon Sep 17 00:00:00 2001 From: Lukasz Rekucki Date: Fri, 21 Aug 2009 10:29:00 +0200 Subject: [PATCH 1/1] =?utf8?q?Wy=C5=9Bwietlanie=20wg.=20repozytori=C3=B3w.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../app/controllers/publications_controller.rb | 10 ++++++---- .../app/views/publications/refresh.erb | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/redmine/redmine_publications/app/controllers/publications_controller.rb b/redmine/redmine_publications/app/controllers/publications_controller.rb index 7b4164c8..a9d7c15a 100644 --- a/redmine/redmine_publications/app/controllers/publications_controller.rb +++ b/redmine/redmine_publications/app/controllers/publications_controller.rb @@ -17,22 +17,24 @@ class PublicationsController < ApplicationController regexp = Regexp.new(Setting.plugin_redmine_publications[:pattern]) Repository.all.each do |repo| + repo_status = [] repo.entries.each do |entry| match = entry.path.match(regexp) if match Publication.find_or_create_by_name(:name => match[1], :source_file => entry.path, :repository_id => repo.id) - @match_status += [{:path => entry.path, :match => match[1], :matched => true}] + repo_status += [{:path => entry.path, :match => match[1], :matched => true}] else - @match_status += [{:path => entry.path, :match =>nil, :matched => false}] + repo_status += [{:path => entry.path, :match =>nil, :matched => false}] end end + @match_status += [{:repo => repo, :status => repo_status}] end respond_to do |format| format.html - format.xml { render :xml => @publications } - format.json { render :json => @publications } + format.xml { render :xml => @match_status} + format.json { render :json => @match_status } end end diff --git a/redmine/redmine_publications/app/views/publications/refresh.erb b/redmine/redmine_publications/app/views/publications/refresh.erb index cf972cad..1968a926 100644 --- a/redmine/redmine_publications/app/views/publications/refresh.erb +++ b/redmine/redmine_publications/app/views/publications/refresh.erb @@ -1,8 +1,9 @@ +<% @match_status.each do |repo_status| %> +

Repozytorium: <%= repo_status[:repo].url %>

- -<% @match_status.each do |status| %> +<% repo_status[:status].each do |status| %> @@ -10,3 +11,4 @@ <% end %>
Ścieżka zasobuRozpoznanoID zasobu
<%= status[:path] %> <%= (status[:matched] && 'Tak') || 'Nie' %>
+<% end %> -- 2.20.1