Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table

This commit is contained in:
Jason Denney
2013-04-24 07:56:02 -04:00
parent 91bb2ea43e
commit a083ed715b
5 changed files with 6 additions and 8 deletions
+1 -2
View File
@@ -37,7 +37,7 @@ class AppTabPanel < Netzke::Basepack::TabPanel
wrappedComponent: :transactions_border,
title: "Transactions"},
:logs,
:user_roles
:user_role_joins
]
end
@@ -48,7 +48,6 @@ class AppTabPanel < Netzke::Basepack::TabPanel
self.class.component item[:wrappedComponent]
end
end
c.prevent_header = true
c.tbar = [:sign_out]
c.items = @@app_tab_panel_items
@@ -1,10 +1,10 @@
class UserRoles < Netzke::Basepack::Grid
class UserRoleJoins < Netzke::Basepack::Grid
def configure(c)
super
c.model = "UserRoleJoin"
c.title = "User Roles"
#c.columns = [ :user__first_name, :role__role, :created_at, :updated_at, :ends ]
c.columns = [ :user__first_name, :role__role, :created_at, :updated_at, :ends ]
#c.columns = [ :user__first_name]
end
#override with nil to remove actions
+1 -1
View File
@@ -1,5 +1,5 @@
class UserRoleJoin < ActiveRecord::Base
#set_table_name :user_role_joins
set_table_name :user_role_joins
attr_accessible :role_id, :user_id
belongs_to :user