Wyświetlanie wg. repozytoriów.

diff --git a/redmine/redmine_publications/app/controllers/publications_controller.rb b/redmine/redmine_publications/app/controllers/publications_controller.rb
index 7b4164c..a9d7c15 100644 (file)
--- 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|
 
        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)
          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
             else

-             @match_status += [{:path => entry.path, :match =>nil, :matched => false}]
+             repo_status += [{:path => entry.path, :match =>nil, :matched => false}]

            end
           end
            end
           end

+          @match_status += [{:repo => repo, :status => repo_status}]

         end    
        
        respond_to do |format|  
          format.html
         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
 
        end
   end
 

diff --git a/redmine/redmine_publications/app/views/publications/refresh.erb b/redmine/redmine_publications/app/views/publications/refresh.erb
index cf972ca..1968a92 100644 (file)
--- 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| %>
+<h2>Repozytorium: <%= repo_status[:repo].url %></h2>

 <table>
 <table>

-

 <tr><th>Ścieżka zasobu</th><th>Rozpoznano</th><th>ID zasobu</th></tr>
 
 <tr><th>Ścieżka zasobu</th><th>Rozpoznano</th><th>ID zasobu</th></tr>
 

-<% @match_status.each do |status| %>
+<% repo_status[:status].each do |status| %>

 <tr>
 <td><%= status[:path] %></td>
 <td><%= (status[:matched] && 'Tak') || 'Nie' %></td>
 <tr>
 <td><%= status[:path] %></td>
 <td><%= (status[:matched] && 'Tak') || 'Nie' %></td>


@@ -10,3 +11,4 @@
 </tr>
 <% end %>
 </table>
 </tr>
 <% end %>
 </table>

+<% end %>