Showing
10 changed files
with
64 additions
and
11 deletions
app/controllers/admin/groups_controller.rb
0 → 100644
1 | class Group < ApplicationRecord | 1 | class Group < ApplicationRecord |
2 | - belongs_to :pool, -> { with_deleted }, inverse_of: :groups | 2 | + belongs_to :pool, inverse_of: :groups |
3 | has_and_belongs_to_many :users, inverse_of: :groups | 3 | has_and_belongs_to_many :users, inverse_of: :groups |
4 | 4 | ||
5 | validates :name, :pool, presence: true | 5 | validates :name, :pool, presence: true |
6 | + delegate :name, to: :pool, prefix: true | ||
7 | + | ||
8 | + def users_count | ||
9 | + users.count | ||
10 | + end | ||
6 | end | 11 | end | ... | ... |
app/views/admin/groups/_form.html.slim
0 → 100644
app/views/admin/groups/edit.html.slim
0 → 100644
app/views/admin/groups/index.html.slim
0 → 100644
1 | +div style='margin-top: 100px' | ||
2 | + h2 | ||
3 | + | Groups | ||
4 | + = link_to 'New Group', new_admin_group_path, style: 'float: right' | ||
5 | + | ||
6 | + - attrs = %i[name pool_name users_count] | ||
7 | + table | ||
8 | + thead | ||
9 | + - attrs.each do |a| | ||
10 | + th = Group.human_attribute_name(a) | ||
11 | + th | ||
12 | + tbody | ||
13 | + tbody | ||
14 | + - @object_collection.each do |model| | ||
15 | + - attrs.each do |a| | ||
16 | + td = model.send(a) | ||
17 | + td | ||
18 | + = link_to 'Edit', edit_admin_group_path(model) | ||
19 | + | ||
20 | + |
app/views/admin/groups/new.html.slim
0 → 100644
1 | class CreateGroupUser < ActiveRecord::Migration[5.0] | 1 | class CreateGroupUser < ActiveRecord::Migration[5.0] |
2 | def change | 2 | def change |
3 | - create_table :group_users do |t| | 3 | + create_table :groups_users do |t| |
4 | t.integer :group_id, index: true | 4 | t.integer :group_id, index: true |
5 | t.integer :user_id, index: true | 5 | t.integer :user_id, index: true |
6 | end | 6 | end | ... | ... |
... | @@ -24,13 +24,6 @@ ActiveRecord::Schema.define(version: 20180611152633) do | ... | @@ -24,13 +24,6 @@ ActiveRecord::Schema.define(version: 20180611152633) do |
24 | t.integer "points" | 24 | t.integer "points" |
25 | end | 25 | end |
26 | 26 | ||
27 | - create_table "group_users", force: :cascade do |t| | ||
28 | - t.integer "group_id" | ||
29 | - t.integer "user_id" | ||
30 | - t.index ["group_id"], name: "index_group_users_on_group_id", using: :btree | ||
31 | - t.index ["user_id"], name: "index_group_users_on_user_id", using: :btree | ||
32 | - end | ||
33 | - | ||
34 | create_table "groups", force: :cascade do |t| | 27 | create_table "groups", force: :cascade do |t| |
35 | t.integer "pool_id" | 28 | t.integer "pool_id" |
36 | t.string "name" | 29 | t.string "name" |
... | @@ -39,6 +32,13 @@ ActiveRecord::Schema.define(version: 20180611152633) do | ... | @@ -39,6 +32,13 @@ ActiveRecord::Schema.define(version: 20180611152633) do |
39 | t.index ["pool_id"], name: "index_groups_on_pool_id", using: :btree | 32 | t.index ["pool_id"], name: "index_groups_on_pool_id", using: :btree |
40 | end | 33 | end |
41 | 34 | ||
35 | + create_table "groups_users", force: :cascade do |t| | ||
36 | + t.integer "group_id" | ||
37 | + t.integer "user_id" | ||
38 | + t.index ["group_id"], name: "index_groups_users_on_group_id", using: :btree | ||
39 | + t.index ["user_id"], name: "index_groups_users_on_user_id", using: :btree | ||
40 | + end | ||
41 | + | ||
42 | create_table "heimdall_engine_role_abilities", force: :cascade do |t| | 42 | create_table "heimdall_engine_role_abilities", force: :cascade do |t| |
43 | t.integer "role_id" | 43 | t.integer "role_id" |
44 | t.string "key" | 44 | t.string "key" | ... | ... |
-
Please register or login to post a comment