Replaces repository_enable named scope on Project with a more generic one: has_module.
The new named scope uses raw sql condition to avoid enabled_modules association loading. git-svn-id: http://redmine.rubyforge.org/svn/branches/nbc@1805 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
c77d9712ca
commit
231e98f0c7
2 files changed
+2
-2
No files matched your search
@@ -24,7 +24,7 @@ class SysController < ActionController::Base
|
|||||||
|
|
||||||
# Returns the projects list, with their repositories
|
# Returns the projects list, with their repositories
|
||||||
def projects_with_repository_enabled
|
def projects_with_repository_enabled
|
||||||
Project.repository_enabled(:all, :include => :repository, :order => 'identifier')
|
Project.has_module(:repository).find(:all, :include => :repository, :order => 'identifier')
|
||||||
end
|
end
|
||||||
|
|
||||||
# Registers a repository for the given project identifier
|
# Registers a repository for the given project identifier
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ class Project < ActiveRecord::Base
|
|||||||
|
|
||||||
before_destroy :delete_all_members
|
before_destroy :delete_all_members
|
||||||
|
|
||||||
named_scope :repository_enabled, { :include => :enabled_modules, :conditions => ["#{EnabledModule.table_name}.name=?", 'repository'] }
|
named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
|
||||||
|
|
||||||
def identifier=(identifier)
|
def identifier=(identifier)
|
||||||
super unless identifier_frozen?
|
super unless identifier_frozen?
|
||||||
|
|||||||
Reference in new issue
Block a user