mongoid-forums 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73b738bfa58a6743dcb67ec79b38604287d6f666
-  data.tar.gz: 3999f2852e03a0bfddf5e24d0e788e61e4c891f0
+  metadata.gz: 9bdf3c71e24211880b870d5f17158a1dbfd49005
+  data.tar.gz: 75379a0a853b6ef2db67c24e25e77dc42fb872ad
 SHA512:
-  metadata.gz: c49e8ef5e09919a913a55bc7ff9ae13761004b0efa788aac080b8fe05ffae95fad4c9c6ac2123230977bdbd47746cc612982e5e81fb659c8dfd425115e2c60c0
-  data.tar.gz: 43cfa20eda79aec5f0985b5d046bea08fbc3a59dd3f52c712df888c39fb376fb8dff9c5d65809d36ec970309f1aabb9d493a346627f0870a7c36d886ac6d32ab
+  metadata.gz: 40ef04419c68fd0bcba32664e6a908bd3110a86e25d3d74be920e75d2cf5d6411fc948b93e292753bb6f0e7dbd518f90a4bfcf7d516ed08f6512f7ed880d2374
+  data.tar.gz: 2f48f9a3800cd093463a8d8cd42ac97e3ab40a72dab696070d5e060e47b8d2fb0afbd568137f0354621e642d4b744455dff863c9d8e5d7e460b6a785ae8cbf13

data/app/assets/javascripts/mongoid_forums/admin/users.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/mongoid_forums/admin/users.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/mongoid_forums/admin/categories_controller.rb

@@ -6,13 +6,13 @@ module MongoidForums
       before_action :set_category, only: [:add_group, :remove_group]
 
       def index
-        @forums = Forum.all
-        @categories = Category.all
+        @forums = Forum.asc(:position)
+        @categories = Category.asc(:position)
       end
 
       def show
         @category = Category.find(params[:id])
-        @groups = Group.all.where(moderator: true).select{ |group| !@category.moderator_groups.include?(group) }
+        @groups = Group.  all.where(moderator: true).select{ |group| !@category.moderator_groups.include?(group) }
       end
 
       def new
@@ -20,7 +20,7 @@ module MongoidForums
       end
 
       def create
-        if @category = Category.create(name: params[:category][:name])
+        if @category = Category.create(category_params)
           flash[:notice] = "Category created successfully"
           redirect_to admin_categories_path
         else
@@ -76,7 +76,7 @@ module MongoidForums
       private
 
       def category_params
-        params.require(:category).permit(:name)
+        params.require(:category).permit(:name, :position)
       end
 
       def set_category

data/app/controllers/mongoid_forums/admin/forums_controller.rb

@@ -14,7 +14,7 @@ module MongoidForums
       end
 
       def create
-        @forum = Forum.new(name: params[:forum][:name], category: params[:forum][:category])
+        @forum = Forum.new(forum_params)
         if @forum.save
           flash[:notice] = "Forum created successfully"
           redirect_to [:admin, @forum]
@@ -76,7 +76,7 @@ module MongoidForums
       private
 
       def forum_params
-        params.require(:forum).permit(:name, :category)
+        params.require(:forum).permit(:name, :category, :position)
       end
 
       def set_forum

data/app/controllers/mongoid_forums/admin/users_controller.rb

@@ -0,0 +1,34 @@
+require_dependency "mongoid_forums/application_controller"
+
+module MongoidForums
+  module Admin
+    class UsersController < BaseController
+
+      before_action :set_user, only: [:add_admin, :remove_admin]
+
+      def index
+        @admins = User.where(mongoid_admin: true)
+        @non_admins = User.where(mongoid_admin: false)
+      end
+
+      def add_admin
+        @user.mongoid_admin = true
+        @user.save
+        redirect_to admin_users_path
+      end
+
+      def remove_admin
+        @user.mongoid_admin = false
+        @user.save
+        redirect_to admin_users_path
+      end
+
+      private
+
+      def set_user
+        @user = User.find(params[:user][:id])
+      end
+
+    end
+  end
+end

data/app/controllers/mongoid_forums/application_controller.rb

@@ -23,7 +23,7 @@ class MongoidForums::ApplicationController < ApplicationController
   end
 
   def set_categories
-    @categories = MongoidForums::Category.all
+    @categories = MongoidForums::Category.asc(:position)
   end
 
     def authenticate_mongoid_forums_user

data/app/controllers/mongoid_forums/forums_controller.rb

@@ -6,7 +6,7 @@ module MongoidForums
     before_filter :authenticate_mongoid_forums_user, :only => [:create, :new]
 
     def index
-      @categories = Category.all.order_by([:order, :asc])
+      @categories = Category.asc(:position)
     end
 
     def show
@@ -51,15 +51,15 @@ module MongoidForums
       end
     end
 
-  private
+    private
 
-  def register_view
-    @forum.register_view_by(mongoid_forums_user)
-  end
+    def register_view
+      @forum.register_view_by(mongoid_forums_user)
+    end
 
-  def topic_params
-    params.require(:topic).permit(:name, :posts => [:text])
-  end
+    def topic_params
+      params.require(:topic).permit(:name, :posts => [:text])
+    end
 
 
   end

data/app/controllers/mongoid_forums/topics_controller.rb

@@ -5,7 +5,6 @@ module MongoidForums
     before_filter :find_forum, :except => [:my_subscriptions, :my_posts, :my_topics]
 
     def show
-
       if find_topic
         register_view
 

data/app/helpers/mongoid_forums/admin/users_helper.rb

@@ -0,0 +1,4 @@
+module MongoidForums
+  module Admin::UsersHelper
+  end
+end

data/app/models/mongoid_forums/category.rb

@@ -9,7 +9,8 @@ module MongoidForums
     field :name
     validates :name, :presence => true
 
-    field :order, :type => Integer, :default => 0
+    field :position, :type => Integer, :default => 0
+    validates :position, numericality: { only_integer: true }
 
     def moderator?(user)
       return false unless user

data/app/models/mongoid_forums/forum.rb

@@ -16,7 +16,8 @@ module MongoidForums
 
     has_and_belongs_to_many :moderator_groups, :class_name => "MongoidForums::Group", inverse_of: nil
 
-    field :order, :type => Integer, :default => 0
+    field :position, :type => Integer, :default => 0
+    validates :position, numericality: { only_integer: true }
 
     def unread_topic_count(user)
       view = View.where(:viewable_id => id, :user_id => user.id).first

data/app/views/mongoid_forums/admin/base/index.haml

@@ -3,3 +3,4 @@
 =link_to "Manage Categories", admin_categories_path
 =link_to "Manage Forums", admin_forums_path
 =link_to "Manage Groups", admin_groups_path
+=link_to "Manage Users", admin_users_path

data/app/views/mongoid_forums/admin/categories/edit.haml

@@ -1,3 +1,4 @@
 = simple_form_for [:admin, @category] do |f|
   = f.input :name
+  = f.input :position
   = f.submit "Update Category", :class => "btn", :disable_with => "Updating..."

data/app/views/mongoid_forums/admin/categories/new.haml

@@ -1,3 +1,4 @@
 = simple_form_for [:admin, @category] do |f|
   = f.input :name
+  = f.input :position
   = f.submit "Create Category", :class => "btn", :disable_with => "Creating..."

data/app/views/mongoid_forums/admin/forums/edit.haml

@@ -1,4 +1,5 @@
 = simple_form_for [:admin, @forum] do |f|
   = f.input :name
   = f.input :category, collection: MongoidForums::Category.all
+  = f.input :position
   = f.submit "Update Forum", :class => "btn", :disable_with => "Updating..."

data/app/views/mongoid_forums/admin/forums/new.haml

@@ -1,4 +1,5 @@
 = simple_form_for [:admin, @forum] do |f|
   = f.input :name
   = f.input :category, collection: MongoidForums::Category.all
+  = f.input :position
   = f.submit "Create Forum", :class => "btn", :disable_with => "Creating..."

data/app/views/mongoid_forums/admin/groups/show.haml

@@ -13,7 +13,14 @@
       %td
         = button_to "Remove", admin_group_rem_user_path(group_id: @group.id, user: {id: member}), method: :post, data: { confirm: 'Are you certain you want to delete this?' }
 
-= form_tag admin_group_add_user_path(@group), :method => :post do
-  = collection_select(:user, :id, @users, :id, :email, {:prompt => true})
-  %button
-    Add
+= form_tag admin_group_add_user_path(@group), :method => :post, :id => "form_add_user" do
+  %input{:id => "userinput", :list => "users", :name => "[user][id]"}/
+  %datalist#users
+    - @users.each do |user|
+      %option{:id => user.id, :value => user.forum_display_name}
+  = submit_tag("Add User")
+
+:javascript
+  $("#form_add_user").submit(function(){
+    $("#userinput").val($('#users').find('option[value="' + $('#userinput').val() + '"]').attr('id'));
+  });

data/app/views/mongoid_forums/admin/users/index.haml

@@ -0,0 +1,24 @@
+%h3 Listing all admins
+%table{:border => "1"}
+  %tr
+    %th
+      Name
+
+  - @admins.each do |admin|
+    %tr
+      %td
+        = admin.forum_display_name
+      %td
+        = button_to "Remove", admin_user_remove_admin_path("dummy", user: {id: admin.id}), method: :post, data: { confirm: 'Are you certain you want to delete this?' }
+
+= form_tag admin_user_add_admin_path("dummy"), :method => :post, :id => "form_add_user" do
+  %input{:id => "userinput", :list => "users", :name => "[user][id]"}/
+  %datalist#users
+    - @non_admins.each do |user|
+      %option{:id => user.id, :value => user.forum_display_name}
+  = submit_tag("Add Admin")
+
+:javascript
+  $("#form_add_user").submit(function(){
+    $("#userinput").val($('#users').find('option[value="' + $('#userinput').val() + '"]').attr('id'));
+  });

data/app/views/mongoid_forums/forums/index.haml

@@ -21,7 +21,7 @@
       %th
         Views
 
-    - category.forums.order_by([:order, :asc]).each do |forum|
+    - category.forums.asc(:position).each do |forum|
       %tr
         %td
           = link_to forum.name, forum

data/config/routes.rb

@@ -22,6 +22,11 @@ MongoidForums::Engine.routes.draw do
         get 'toggle_pin' => 'topics#toggle_pin', :as => 'toggle_pin'
       end
     end
+
+    resources :users do
+      post '/add' => 'users#add_admin', as: 'add_admin'
+      post '/remove' => 'users#remove_admin', as: 'remove_admin'
+    end
   end
 
   root :to => "forums#index"

data/lib/mongoid_forums/version.rb

@@ -1,3 +1,3 @@
 module MongoidForums
-  VERSION = "0.0.5"
+  VERSION = "0.0.9"
 end

data/lib/mongoid_forums.rb

@@ -18,7 +18,7 @@ module MongoidForums
         has_many :mongoid_forums_posts, :class_name => "MongoidForums::Post", :foreign_key => "user_id"
         has_many :mongoid_forums_topics, :class_name => "MongoidForums::Topic", :foreign_key => "user_id"
 
-        field :mongoid_admin, type: Boolean
+        field :mongoid_admin, type: Boolean, default: false
 
         def mongoid_forums_admin?
           mongoid_admin

data/test/controllers/mongoid_forums/admin/users_controller_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+module MongoidForums
+  class Admin::UsersControllerTest < ActionController::TestCase
+    test "should get index" do
+      get :index
+      assert_response :success
+    end
+
+  end
+end

data/test/dummy/app/assets/javascripts/application.js

@@ -10,4 +10,6 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery
+//= require jquery_ujs
 //= require_tree .