Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed admin generator to allow removing the admin (using it with -d). It currently fails. #1013

Merged
merged 1 commit into from Jan 14, 2013
Merged

Fixed admin generator to allow removing the admin (using it with -d). It currently fails. #1013

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions padrino-admin/lib/padrino-admin/generators/admin_app.rb
View file
Open in desktop
Expand Up @@ -60,7 +60,9 @@ def create_admin
directory "templates/assets", destination_root("public", "admin")
template "templates/app.rb.tt", destination_root("admin/app.rb")
append_file destination_root("config/apps.rb"), "\nPadrino.mount(\"Admin\").to(\"/admin\")"
insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:mini_record, :activerecord].include?(orm)
unless options[:destroy]
insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', 'admin' if [:mini_record, :activerecord].include?(orm)
end

params = [
@model_singular, "name:string", "surname:string", "email:string", "crypted_password:string", "role:string",
Expand All @@ -82,9 +84,11 @@ def create_admin
{ :name => :role, :field_type => :text_field }
]

admin_app = Padrino::Generators::AdminPage.new([@model_singular], :root => options[:root], :destroy => options[:destroy])
admin_app.default_orm = Padrino::Admin::Generators::Orm.new(@model_singular, orm, columns, column_fields)
admin_app.invoke_all
unless options[:destroy]
admin_app = Padrino::Generators::AdminPage.new([@model_singular], :root => options[:root], :destroy => options[:destroy])
admin_app.default_orm = Padrino::Admin::Generators::Orm.new(@model_singular, orm, columns, column_fields)
admin_app.invoke_all
end

template "templates/account/#{orm}.rb.tt", destination_root(options[:app], "models", "#{@model_singular}.rb"), :force => true

Expand All @@ -103,8 +107,10 @@ 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 @model_plural
require_dependencies('bcrypt-ruby', :require => 'bcrypt')
unless options[:destroy]
add_project_module @model_plural
require_dependencies('bcrypt-ruby', :require => 'bcrypt')
end

# A nicer select box
gsub_file destination_root("admin/views/#{@model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
Expand Down