From 61e54e8052908ea96efd2542d4074094912eb49e Mon Sep 17 00:00:00 2001 From: Joel Cuevas Date: Wed, 15 Feb 2012 13:03:55 -0600 Subject: [PATCH] Fix #780 - Admin generator is not completely aware of the user defined model name --- padrino-admin/lib/padrino-admin/generators/admin_app.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/padrino-admin/lib/padrino-admin/generators/admin_app.rb b/padrino-admin/lib/padrino-admin/generators/admin_app.rb index 43684b3d9..6e79e2d44 100644 --- a/padrino-admin/lib/padrino-admin/generators/admin_app.rb +++ b/padrino-admin/lib/padrino-admin/generators/admin_app.rb @@ -103,10 +103,13 @@ def create_admin template "templates/#{ext}/app/layouts/application.#{ext}.tt", destination_root("admin/views/layouts/application.#{ext}") template "templates/#{ext}/app/sessions/new.#{ext}.tt", destination_root("admin/views/sessions/new.#{ext}") - add_project_module :accounts + model_singular = options[:admin_model].underscore + model_plural = model_singular.pluralize + + add_project_module model_plural require_dependencies('bcrypt-ruby', :require => 'bcrypt') - gsub_file destination_root("admin/views/accounts/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles" - gsub_file destination_root("admin/controllers/accounts.rb"), "if account.destroy", "if account != current_account && account.destroy" + gsub_file destination_root("admin/views/#{model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles" + gsub_file destination_root("admin/controllers/#{model_plural}.rb"), "if #{model_singular}.destroy", "if #{model_singular} != current_account && #{model_singular}.destroy" return if self.behavior == :revoke instructions = []