admin_data 1.0.8 → 1.0.9

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/rdoctask'
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test admin_data plugin.'
+desc 'Test admin_data gem.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'

data/app/controllers/admin_data/base_controller.rb

@@ -31,8 +31,8 @@ class AdminData::BaseController < ApplicationController
     render :text => 'not authorized', :status => :unauthorized unless admin_data_is_allowed_to_update?
   end
 
-  def ensure_is_allowed_to_update_model
-    render :text => 'not authorized', :status => :unauthorized unless admin_data_is_allowed_to_update_model?
+  def ensure_is_allowed_to_update_klass
+    render :text => 'not authorized', :status => :unauthorized unless admin_data_is_allowed_to_update_klass?
   end
 
 
@@ -49,19 +49,32 @@ class AdminData::BaseController < ApplicationController
   end
 
   def build_klasses
-    unless defined? $admin_data_klasses
+    # if is_allowed_to_view_klass option is passed then golbal constant can't be used since
+    # list of klasses need to be built for each user. It will slow down the speed a bit since
+    # every single the list needs to be built
+    if AdminData::Config.setting[:is_allowed_to_view_klass]
+      @klasses = _build_custom_klasses
+    else
+      @klasses = _build_all_klasses
+    end
+  end
+
+  def _build_all_klasses
+    if defined? $admin_data_all_klasses
+      return $admin_data_all_klasses
+    else
       model_dir = File.join(Rails.root, 'app', 'models')
       model_names = Dir.chdir(model_dir) { Dir["**/*.rb"] }
       klasses = get_klass_names(model_names)
-      filtered_klasses = remove_klasses_without_table(klasses).sort_by {|r| r.name.underscore}
-      klasses_with_security_clearance = filtered_klasses.compact.select do |klass_local|
-        @klass = klass_local
-        admin_data_is_allowed_to_view_klass?
-      end
-      #TODO remove global constant. it is not thread safe
-      $admin_data_klasses = klasses_with_security_clearance
+      $admin_data_all_klasses = remove_klasses_without_table(klasses).sort_by {|r| r.name.underscore}
+    end
+  end
+
+  def _build_custom_klasses
+    _build_all_klasses.compact.select do |klass_local|
+      @klass = klass_local
+      admin_data_is_allowed_to_view_klass?
     end
-    @klasses = $admin_data_klasses
   end
 
   def remove_klasses_without_table(klasses)
@@ -92,7 +105,7 @@ class AdminData::BaseController < ApplicationController
   end
 
   def check_page_parameter
-    # Got hoptoad error because of url like 
+    # Got hoptoad error because of url like
     # http://localhost:3000/admin_data/User/advance_search?page=http://201.134.249.164/intranet/on.txt?
     if params[:page].blank? || (params[:page] =~ /\A\d+\z/)
       # proceed

data/app/controllers/admin_data/main_controller.rb

@@ -12,7 +12,7 @@ class AdminData::MainController  < AdminData::BaseController
 
   before_filter :ensure_is_allowed_to_update, :only => [:destroy, :del, :edit, :update, :create]
 
-  before_filter :ensure_is_allowed_to_update_model, :only => [:destroy, :del, :edit, :update, :create]
+  before_filter :ensure_is_allowed_to_update_klass, :only => [:destroy, :del, :edit, :update, :create]
 
 
   def table_structure

data/lib/admin_data/chelper.rb

@@ -10,7 +10,7 @@ module AdminData::Chelper
   end
 
   def admin_data_is_allowed_to_view_klass?
-    return true if Rails.env.development?
+    return true if Rails.env.development? || AdminData::Config.setting[:is_allowed_to_view_klass].blank?
     AdminData::Config.setting[:is_allowed_to_view_klass].call(self)
   end
 
@@ -19,9 +19,9 @@ module AdminData::Chelper
     AdminData::Config.setting[:is_allowed_to_update].call(self)
   end
 
-  def admin_data_is_allowed_to_update_model?
+  def admin_data_is_allowed_to_update_klass?
     return true if Rails.env.development?
-    AdminData::Config.setting[:is_allowed_to_update_model].call(self)
+    AdminData::Config.setting[:is_allowed_to_update_klass].call(self)
   end
 
   def admin_data_invalid_record_link(klassu, id, error)

data/lib/admin_data/settings.rb

@@ -9,17 +9,18 @@ class AdminData::Config
     find_conditions
     plugin_dir
     will_paginate_per_page
+    
     is_allowed_to_view
+    is_allowed_to_view_klass
+    is_allowed_to_update
+    is_allowed_to_update_klass
+
     is_allowed_to_view_feed
     feed_authentication_user_id
     feed_authentication_password
-    is_allowed_to_view_klass
-    is_allowed_to_update
-    is_allowed_to_update_model
     column_settings
     columns_order
     use_google_hosting_for_jquery
-    rake_options
     drop_down_for_associations
     ignore_column_limit
     ).collect(&:intern)
@@ -30,13 +31,6 @@ class AdminData::Config
     self.setting ||= {}
     self.setting.merge!(input)
 
-    unless self.setting[:rake_options].blank?
-      env = self.setting[:rake_options][:env]
-      if env.blank? || env.include?(Rails.env.intern)
-        self.setting[:rake_command] = self.setting[:rake_options][:command]
-      end
-    end
-
   end
 
   def self.initialize_defaults
@@ -50,9 +44,9 @@ class AdminData::Config
 
       :is_allowed_to_update         => lambda {|controller| return true if Rails.env.development? },
 
-      :is_allowed_to_view_klass     => lambda {|controller| return true  },
+      :is_allowed_to_view_klass     => nil, 
 
-      :is_allowed_to_update_model   => lambda {|controller| return true  },
+      :is_allowed_to_update_klass   => lambda {|controller| return true  },
 
       :find_conditions              => nil,
 

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/lib/admin_data.rb

@@ -3,12 +3,7 @@ begin
 rescue LoadError => e
   $stderr.puts %(
   *************************************************************************************************
-  *                                                                                               *
   * gem will_paginate is missing                                                                  *
-  * plugin admin_data depends on will_paginate                                                    *
-  * Please install will_paginate by adding following line to Gemfile                              *
-  * gem 'will_paginate', :git => 'git://github.com/mislav/will_paginate.git', :branch => 'rails3' *
-  *                                                                                               *
   *************************************************************************************************
   )
 end
@@ -19,7 +14,7 @@ end
 if Rails.version >= '3.0'
   require 'admin_data/railtie'
 else
-  raise "Please see documentation at http://neerajdotname.github.com/admin_data to find out how to use this plugin with rails 2.3"
+  raise "Please see documentation at http://github.com/neerajdotname/admin_data to find out how to use this gem with rails 2.3"
 end
 
 # move date_validation to inside admin_data

data/lib/js/advance_search/act_on_result.js

@@ -3,7 +3,6 @@ var AdminData = AdminData || {};
 AdminData.actOnResult = {
 
 	action: function(action_type) {
-            log('has been invoked');
 		var formData = $('#advance_search_form').data('admin_data_form_array'),
 		parameterizedData;