diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index b06ac4e..7baca76 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -60,6 +60,10 @@ class Admin::GroupsController < OrbitGroupController end end + def members + render_401 and return if !user_can_read? + end + def create_category gc = GroupCategory.new(category_params) gc.save diff --git a/app/controllers/orbit_group_controller.rb b/app/controllers/orbit_group_controller.rb index 2e2e8a4..7fb729c 100644 --- a/app/controllers/orbit_group_controller.rb +++ b/app/controllers/orbit_group_controller.rb @@ -7,7 +7,7 @@ class OrbitGroupController < ApplicationController when "show","edit" uid = params[:id].split("-").last @group = Group.find_by(:uid => uid) - when "newpost", "createpost" + when "newpost", "createpost", "members" uid = params[:group_id].split("-").last @group = Group.find_by(:uid => uid) when "showpost" @@ -21,7 +21,7 @@ class OrbitGroupController < ApplicationController @access_right_level = "none" read_or_write = @group.permission rescue "read" case params[:action] - when "show", "showpost", "newpost", "edit" + when "show", "showpost", "newpost", "edit", "members" is_member = @group.users.include?(current_user) if @group.admins.include?(current_user.id.to_s) @access_right_level = "admin" diff --git a/app/views/admin/groups/members.html.erb b/app/views/admin/groups/members.html.erb new file mode 100644 index 0000000..e9ce9b9 --- /dev/null +++ b/app/views/admin/groups/members.html.erb @@ -0,0 +1,28 @@ +<% content_for :page_specific_css do -%> + <%= stylesheet_link_tag "lib/group/group-main" %> + <%= stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" %> + <%= stylesheet_link_tag "//cdnjs.cloudflare.com/ajax/libs/animate.css/3.2.6/animate.min.css" %> +<% end -%> +<% content_for :page_specific_javascript do -%> + <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.min.js" %> + <%= javascript_include_tag "group.js" %> +<% end -%> +
+
+
+ <%= @group.title %> +
+
+

<%= @group.title %> - Members

+
+
+
+
+
+ +
+
diff --git a/app/views/admin/groups/show.html.erb b/app/views/admin/groups/show.html.erb index babb15b..90df6de 100644 --- a/app/views/admin/groups/show.html.erb +++ b/app/views/admin/groups/show.html.erb @@ -61,6 +61,7 @@ <% end %>

Group Description

<%= @group.description %>

+

<%= @group.users.count %> members.

<%= render :partial => "post", :collection => @group.group_posts.desc(:created_at) %> diff --git a/config/routes.rb b/config/routes.rb index fc90b43..a8131a8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -140,6 +140,7 @@ Orbit::Application.routes.draw do resources :groups do get "newpost" => 'groups#newpost' post "createpost" => 'groups#createpost' + get "members" => 'groups#members' end