8000 Merge pull request #5137 from activeadmin/fix/follow_up_to_file_namin… · stephancom/activeadmin@0e9475d · GitHub 8000
[go: up one dir, main page]

Skip to content

Commit 0e9475d

Browse files
Merge pull request activeadmin#5137 from activeadmin/fix/follow_up_to_file_naming_change
Follow up to new naming convention
2 parents 0de8092 + 8c14ba7 commit 0e9475d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

lib/generators/active_admin/install/install_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def setup_directory
2121
template 'dashboard.rb', 'app/admin/dashboard.rb'
2222
if options[:users].present?
2323
@user_class = name
24-
template 'admin_user.rb.erb', "app/admin/#{name.underscore}.rb"
24+
template 'admin_users.rb.erb', "app/admin/#{name.underscore.pluralize}.rb"
2525
end
2626
end
2727

spec/support/rails_template_with_data.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
config.comments_menu = { parent: 'Administrative' }
66
RUBY
77

8-
inject_into_file 'app/admin/admin_user.rb', <<-RUBY, after: "ActiveAdmin.register AdminUser do\n"
8+
inject_into_file 'app/admin/admin_users.rb', <<-RUBY, after: "ActiveAdmin.register AdminUser do\n"
99
1010
menu parent: "Administrative", priority: 1
1111
RUBY
@@ -80,14 +80,14 @@
8080
generate :'active_admin:resource', type
8181
end
8282

83-
inject_into_file 'app/admin/category.rb', <<-RUBY, after: "ActiveAdmin.register Category do\n"
83+
inject_into_file 'app/admin/categories.rb', <<-RUBY, after: "ActiveAdmin.register Category do\n"
8484
8585
config.create_another = true
8686
8787
permit_params [:name, :description]
8888
RUBY
8989

90-
inject_into_file 'app/admin/user.rb', <<-RUBY, after: "ActiveAdmin.register User do\n"
90+
inject_into_file 'app/admin/users.rb', <<-RUBY, after: "ActiveAdmin.register User do\n"
9191
9292
config.create_another = true
9393
@@ -135,7 +135,7 @@
135135
end
136136
RUBY
137137

138-
inject_into_file 'app/admin/post.rb', <<-'RUBY', after: "ActiveAdmin.register Post do\n"
138+
inject_into_file 'app/admin/posts.rb', <<-'RUBY', after: "ActiveAdmin.register Post do\n"
139139
140140
permit_params :custom_category_id, :author_id, :title, :body, :published_date, :position, :starred, taggings_attributes: [ :id, :tag_id, :name, :position, :_destroy ]
141141
@@ -269,7 +269,7 @@
269269
end
270270
RUBY
271271

272-
inject_into_file 'app/admin/tag.rb', <<-RUBY, after: "ActiveAdmin.register Tag do\n"
272+
inject_into_file 'app/admin/tags.rb', <<-RUBY, after: "ActiveAdmin.register Tag do\n"
273273
274274
config.create_another = true
275275

0 commit comments

Comments
 (0)
0