Dziwny merge, zważywszy, że wcześniej dałem mv panels.js editor.js.

[redakcja.git] / redmine / redmine_publications / app / controllers / publications_controller.rb

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