simpler management of backward compatibility, per saturnflyer

avonderluft · Jan 1, 2010 · 5837d0c · 5837d0c
1 parent 6b0b828
commit 5837d0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/models/group.rb b/app/models/group.rb
@@ -1,6 +1,9 @@
 class Group < ActiveRecord::Base  
-  #named_scope :default, :order => "name"
-  default_scope :order => "name ASC"
+  unless self.respond_to?(:order_by)
+    default_scope :order => "name ASC"
+  else
+    order_by :name
+  end
 
   belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by'
   belongs_to :updated_by, :class_name => 'User', :foreign_key => 'updated_by'

diff --git a/page_group_permissions_extension.rb b/page_group_permissions_extension.rb
@@ -33,8 +33,7 @@ def activate
       Admin::PagesController.module_eval &PageControllerExtensions
       UserActionObserver.instance.send :add_observer!, Group
 
-      # admin.tabs is deprecated with 0.9
-      if Radiant::Version.to_s >= "0.9.0"
+      if self.respond_to?(:tab)
         add_tab "Settings" do
           add_item "Groups", "/admin/groups", :after => "Users", :visibility => [:admin]
         end