Fix supported_scm for recent Redmine and ChiliProject versions

git-svn-id: http://dev.holgerjust.de/svn/redmine-checkout/trunk@204 2c10314b-d60d-4f8f-b362-a6b3e82123ed

Author: meineerde

app/views/settings/_checkout.rhtml

@@ -8,7 +8,7 @@ document.observe("dom:loaded", function() {
     e.down('div').hide();
   });
   <%
-    CheckoutHelper.supported_scm.select{|scm| Setting.enabled_scm.include?(scm)}.each do |scm| 
+    CheckoutHelper.supported_scm.select{|scm| Setting.enabled_scm.include?(scm)}.each do |scm|
       next if Setting.send("checkout_overwrite_description_#{scm}?")
   -%>
   $('settings_checkout_description_<%= scm %>').up('div').up('div').hide();
@@ -30,7 +30,7 @@ document.observe("dom:loaded", function() {
 
 <% CheckoutHelper.supported_scm.select{|scm| Setting.enabled_scm.include?(scm)}.each do |scm| -%>
 <fieldset class="collapsible collapsed">
-  <legend onclick="toggleFieldset(this);"><%= "Repository::#{scm}".constantize.scm_name %></legend>
+  <legend onclick="toggleFieldset(this);"><%= Repository.const_get(scm).scm_name %></legend>
   <div><%= render :partial => 'checkout_scm', :locals => {:scm => scm} %></div>
 </fieldset>
 <%- end %>

init.rb

@@ -5,10 +5,10 @@
   # Patches
   require_dependency 'checkout/application_controller_patch'
   require_dependency 'checkout/settings_controller_patch'
-  
+
   require_dependency 'checkout/repositories_helper_patch'
   require_dependency 'checkout/repository_patch'
-  
+
   require_dependency 'checkout/settings_helper_patch'
   require_dependency 'checkout/setting_patch'
 end
@@ -23,13 +23,13 @@
   author_url 'http://meine-er.de'
   description 'Add links to the actual repository to the repository view.'
   version '0.5'
-  
+
   # required because of the new i18n requirement and changed syntax
   requires_redmine :version_or_higher => '1.0.5'
-  
+
   settings_defaults = HashWithIndifferentAccess.new({
     'use_zero_clipboard' => '1',
-    
+
     'display_checkout_info' =>  'everywhere',
     'description_Abstract' => <<-EOF
 The data contained in this repository can be downloaded to your computer using one of several clients.
@@ -38,17 +38,17 @@
 Please select the desired protocol below to get the URL.
 EOF
   })
-  
+
   # this is needed for setting the defaults
   require 'checkout/repository_patch'
-  
+
   CheckoutHelper.supported_scm.each do |scm|
-    klazz = "Repository::#{scm}".constantize
-    
+    klazz = Repository.const_get(scm)
+
     settings_defaults["description_#{scm}"] = ''
     settings_defaults["overwrite_description_#{scm}"] = '0'
     settings_defaults["display_command_#{scm}"] = '0'
-    
+
     # access can be one of
     #   read+write => this protocol always allows read/write access
     #   read-only => this protocol always allows read access only
@@ -65,9 +65,9 @@
       :display_login => '0'
     })]
   end
-  
+
   settings :default => settings_defaults, :partial => 'settings/redmine_checkout'
-  
+
   Redmine::WikiFormatting::Macros.register do
     desc <<-EOF
 Creates a checkout link to the actual repository. Example:
@@ -85,18 +85,18 @@
       else
         project = @project
       end
-      
+
       if project && project.repository
         protocols = project.repository.checkout_protocols.select{|p| p.access_rw(User.current)}
-        
+
         if proto.present?
           proto_obj = protocols.find{|p| p.protocol.downcase == proto.downcase}
         else
           proto_obj = protocols.find(&:default?) || protocols.first
         end
       end
       raise "Checkout protocol #{proto} not found" unless proto_obj
-      
+
       cmd = (project.repository.checkout_display_command? && proto_obj.command.present?) ? proto_obj.command.strip + " " : ""
       cmd + link_to(proto_obj.url, proto_obj.url)
     end

lib/checkout/repository_patch.rb

@@ -6,61 +6,61 @@ module RepositoryPatch
     def self.included(base) # :nodoc:
       base.extend(ClassMethods)
       base.send(:include, InstanceMethods)
-      
+
       base.class_eval do
         unloadable
         serialize :checkout_settings, Hash
       end
     end
-    
+
     module ClassMethods
       def allow_subtree_checkout?
         # default implementation
         false
       end
-      
+
       def checkout_default_command
         # default implementation
         ""
       end
     end
-    
+
     module InstanceMethods
       def after_initialize
         self.checkout_settings ||= {}
       end
-    
+
       def checkout_overwrite=(value)
         checkout_settings['checkout_overwrite'] = value
       end
-    
+
       def checkout_overwrite
         (checkout_settings['checkout_overwrite'].to_i > 0) ? '1' : '0'
       end
 
       def checkout_overwrite?
         self.type.present? && checkout_overwrite.to_i > 0
       end
-    
+
       def checkout_description=(value)
         checkout_settings['checkout_description'] = value
       end
-    
+
       def checkout_description
         if checkout_overwrite?
           checkout_settings['checkout_description']
         else
-          if CheckoutHelper.supported_scm.include?(type) && Setting.send("checkout_overwrite_description_#{type}?")
+          if CheckoutHelper.supported_scm.include?(type.demodulize) && Setting.send("checkout_overwrite_description_#{type}?")
             Setting.send("checkout_description_#{type}")
           else
             Setting.send("checkout_description_Abstract")
           end
         end
       end
-    
+
       def checkout_protocols
         @checkout_protocols ||= begin
-          if CheckoutHelper.supported_scm.include? type
+          if CheckoutHelper.supported_scm.include?(type.demodulize)
             if checkout_overwrite?
               protocols = checkout_settings['checkout_protocols'] || []
             else
@@ -69,43 +69,43 @@ def checkout_protocols
           else
             protocols = []
           end
-          
+
           protocols.collect do |p|
             Checkout::Protocol.new p.merge({:repository => self})
           end
         end
       end
-    
+
       def checkout_protocols=(value)
         # value is an Array or a Hash
         if value.is_a? Hash
           value = value.dup.delete_if {|id, protocol| id.to_i < 0 }
           value = value.sort{|(ak,av),(bk,bv)|ak<=>bk}.collect{|id,protocol| protocol}
         end
-        
+
         checkout_settings['checkout_protocols'] = value
       end
 
       def checkout_display_command?
         checkout_display_command.to_i > 0
       end
-      
+
       def checkout_display_command=(value)
         checkout_settings['checkout_display_command'] = value
       end
-      
+
       def checkout_display_command
         if checkout_overwrite?
           checkout_settings['checkout_display_command']
         else
           Setting.send("checkout_display_command_#{type}")
         end
       end
-      
+
       def allow_subtree_checkout?
         self.class.allow_subtree_checkout?
       end
-      
+
       def checkout_default_command
         self.class.checkout_default_command
       end
@@ -128,7 +128,7 @@ def checkout_default_command
 CheckoutHelper.supported_scm.each do |scm|
   require_dependency "repository/#{scm.underscore}"
   cls = Repository.const_get(scm)
-  
+
   allow_subtree_checkout = ""
   if subtree_checkout_repos.include? scm
     allow_subtree_checkout = <<-EOS
@@ -137,7 +137,7 @@ def allow_subtree_checkout?
       end
     EOS
   end
-  
+
   checkout_command = ""
   if commands[scm]
     checkout_command = <<-EOS
@@ -146,7 +146,7 @@ def checkout_default_command
       end
     EOS
   end
-  
+
   class_mod = Module.new
   class_mod.module_eval(<<-EOF
     def self.included(base)