mongoid-forums 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4337469d2a29dedec4dbc0a39450cca125016e
-  data.tar.gz: c363a39163571c395122ce2cc9d58687907a182f
+  metadata.gz: 73b738bfa58a6743dcb67ec79b38604287d6f666
+  data.tar.gz: 3999f2852e03a0bfddf5e24d0e788e61e4c891f0
 SHA512:
-  metadata.gz: 53b729da9a4e57e9c5e7fd5ede064670055da5f661cdc60536edc1175642e1b9a15b8dcbae1a5a69367e7b94dcbc7f15220f4b5e4f1e8fd50ed4375e0604aa8d
-  data.tar.gz: 357b1cd80ee8136c9354f724a4c9c4b20f85a9881d0403f0ce1018612cbc605555307adf1e1d65e776daacefa0e6a647ac0fb9e40c889b2a9ded3a5f47ed97b0
+  metadata.gz: c49e8ef5e09919a913a55bc7ff9ae13761004b0efa788aac080b8fe05ffae95fad4c9c6ac2123230977bdbd47746cc612982e5e81fb659c8dfd425115e2c60c0
+  data.tar.gz: 43cfa20eda79aec5f0985b5d046bea08fbc3a59dd3f52c712df888c39fb376fb8dff9c5d65809d36ec970309f1aabb9d493a346627f0870a7c36d886ac6d32ab

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

@@ -14,7 +14,8 @@ module MongoidForums
       end
 
       def create
-        if @forum = Forum.create(name: params[:forum][:name], category: params[:forum][:category])
+        @forum = Forum.new(name: params[:forum][:name], category: params[:forum][:category])
+        if @forum.save
           flash[:notice] = "Forum created successfully"
           redirect_to [:admin, @forum]
         else

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

@@ -39,8 +39,8 @@ module MongoidForums
 
       def show
         @group = Group.find(params[:id])
-        @group_members = @group.members.map {|member_id| User.find(member_id) }
-        @users = User.all
+        @group_members = @group.members.map{|member_id| User.find(member_id) }
+        @users = User.all.select{ |user| !@group.members.include?(user.id) }
       end
 
       def destroy

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

@@ -0,0 +1,48 @@
+module MongoidForums
+  module Admin
+    class TopicsController < BaseController
+      before_filter :find_topic
+
+      def edit
+      end
+
+      def update
+        @topic.subject  = params[:topic][:subject]
+        @topic.pinned   = params[:topic][:pinned]
+        @topic.locked   = params[:topic][:locked]
+        @topic.hidden   = params[:topic][:hidden]
+        @topic.forum_id = params[:topic][:forum_id]
+        if @topic.save
+          flash[:notice] = t("mongoid_forums.topic.updated")
+          redirect_to topic_path(@topic)
+        else
+          flash.alert = t("mongoid_forums.topic.not_updated")
+          render :action => "edit"
+        end
+      end
+
+      def toggle_hide
+        @topic.toggle!(:hidden)
+        flash[:notice] = t("mongoid_forums.topic.hidden.#{@topic.hidden?}")
+        redirect_to topic_path(@topic)
+      end
+
+      def toggle_lock
+        @topic.toggle!(:locked)
+        flash[:notice] = t("mongoid_forums.topic.locked.#{@topic.locked?}")
+        redirect_to topic_path(@topic)
+      end
+
+      def toggle_pin
+        @topic.toggle!(:pinned)
+        flash[:notice] = t("mongoid_forums.topic.pinned.#{@topic.pinned?}")
+        redirect_to topic_path(@topic)
+      end
+
+      private
+        def find_topic
+          @topic = Topic.find(params[:format])
+        end
+    end
+  end
+end

data/app/controllers/mongoid_forums/topics_controller.rb

@@ -5,6 +5,7 @@ module MongoidForums
     before_filter :find_forum, :except => [:my_subscriptions, :my_posts, :my_topics]
 
     def show
+
       if find_topic
         register_view
 
@@ -18,7 +19,7 @@ module MongoidForums
     end
 
     def destroy
-      
+
     end
 
     def my_subscriptions
@@ -61,6 +62,7 @@ module MongoidForums
       begin
         scope = @forum.topics # TODO: pending review stuff
         @topic = scope.find(params[:id])
+        authorize! :read, @topic
       rescue Mongoid::Errors::DocumentNotFound
         flash.alert = t("forem.topic.not_found")
         redirect_to @forum and return

data/app/models/mongoid_forums/forum.rb

@@ -4,6 +4,8 @@ module MongoidForums
     include MongoidForums::Concerns::Viewable
 
     belongs_to :category, :class_name => "MongoidForums::Category"
+    validates :category, :presence => true
+
     has_many :topics, :class_name => "MongoidForums::Topic",  dependent: :destroy
 
     # Caching

data/app/models/mongoid_forums/topic.rb

@@ -24,6 +24,11 @@ module MongoidForums
       !locked?
     end
 
+    def toggle!(field)
+      send "#{field}=", !self.send("#{field}?")
+      save :validation => false
+    end
+
     def unread_post_count(user)
       view = View.where(:viewable_id => id, :user_id => user.id).first
       return posts.count unless view.present?

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

@@ -26,8 +26,9 @@
         %td
           = link_to forum.name, forum
         %td
-          - unless forum.topics.last.nil?
-            - last_post = forum.topics.select {|topic| !topic.hidden }.last.posts.last
+          - if forum.topics.select {|topic| can?(:read, topic) }.last
+            - last_topic = forum.topics.select {|topic| can?(:read, topic) }.last
+            - last_post = last_topic.posts.last
             = time_ago_in_words ( last_post.created_at )
             ago on
             = link_to last_post.topic.name, last_post.topic

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

@@ -22,26 +22,27 @@
       Views
 
   - @topics.each do |topic|
-    %tr
-      %td
-        - if topic.locked
-          &#128274
-        - if topic.hidden
-          ⚠
-        - if topic.pinned
-          *
-        = link_to topic.name, topic
-      %td
-        = topic.user.forum_display_name
-        = time_ago_in_words( topic.created_at )
-        ago
-      %td
-        = topic.posts.last.user.forum_display_name
-        = time_ago_in_words( topic.posts.last.created_at )
-        ago
-      %td
-        = mongoid_forums_user ? topic.unread_post_count(mongoid_forums_user) : ""
-      %td
-        = topic.posts.count
-      %td
-        = topic.views_count ? topic.views_count : "None"
+    - if can?(:read, topic)
+      %tr
+        %td
+          - if topic.locked
+            &#128274
+          - if topic.hidden
+            ⚠
+          - if topic.pinned
+            *
+          = link_to topic.name, topic
+        %td
+          = topic.user.forum_display_name
+          = time_ago_in_words( topic.created_at )
+          ago
+        %td
+          = topic.posts.last.user.forum_display_name
+          = time_ago_in_words( topic.posts.last.created_at )
+          ago
+        %td
+          = mongoid_forums_user ? topic.unread_post_count(mongoid_forums_user) : ""
+        %td
+          = topic.posts.count
+        %td
+          = topic.views_count ? topic.views_count : "None"

data/app/views/mongoid_forums/posts/_post.haml

@@ -8,7 +8,7 @@
 ago
 
 = link_to 'Quote', new_topic_post_path(post.topic_id, :reply_to_id => post.id)
-- if post.owner_or_admin?(mongoid_forums_user)
+- if mongoid_forums_user && post.owner_or_admin?(mongoid_forums_user)
   - if can?(:edit_post, post.topic.forum)
     = link_to "Edit", edit_topic_post_path(post.topic_id, post)
   - if can?(:destroy_post, post.topic.forum)

data/app/views/mongoid_forums/topics/show.haml

@@ -1,4 +1,9 @@
 %h1 Viewing Topic "#{@topic.name}"
+- if mongoid_forums_admin?
+  = link_to t("mongoid_forums.topics.actions.hide.#{@topic.hidden}"), toggle_hide_admin_topic_path(@forum, @topic), :class => "btn"
+  = link_to t("mongoid_forums.topics.actions.lock.#{@topic.locked}"), toggle_lock_admin_topic_path(@forum, @topic), :class => "btn"
+  = link_to t("mongoid_forums.topics.actions.pin.#{@topic.pinned}"), toggle_pin_admin_topic_path(@forum, @topic), :class => "btn"
+
 - if @topic.can_be_replied_to? && can?(:reply, @topic)
   = link_to "Reply to topic", new_topic_post_path(@topic)
 - if mongoid_forums_user && @topic.subscriber?(mongoid_forums_user.id)

data/config/locales/en.yml

@@ -0,0 +1,192 @@
+en:
+  mongoid_forums:
+    general:
+      forum: Forum
+      topics: Topics
+      topic: Topic
+      posts: Posts
+      posts_count:
+        zero: No posts
+        one: 1 post
+        other: "%{count} posts"
+      flagged_for_spam: Your account has been flagged for spam.
+      cannot_create_topic: You cannot create a new topic at this time.
+      cannot_create_post: You cannot create a new post at this time.
+
+    access_denied: "You are not allowed to do that."
+    admin:
+      area: Admin Area
+      welcome: "Welcome to mongoid_forum's Admin Area."
+      forum:
+        index: Manage Forums
+        new: Creating a new forum
+        new_link: New Forum
+        deleted: The selected forum has been deleted.
+        created: This forum has been created.
+        not_created: This forum could not be created.
+        updated: That forum has been updated.
+        not_updated: This forum could not be updated.
+      forums:
+        edit: Edit
+        delete: Delete
+        category: Category
+        delete_confirm: Are you sure you want to delete this forum?
+        index:
+          last_post: Last post
+          none: None
+      group:
+        index: Manage Groups
+        created: The group was successfully created.
+        not_created: Group could not be created.
+        deleted: The selected group has been deleted.
+      groups:
+        show:
+          add_member: Add
+      category:
+        index: Manage Forum Categories
+        new: Creating a new Forum Category
+        new_link: New Forum Category
+        deleted: The selected forum category has been deleted.
+        created: This forum category has been created.
+        not_created: This forum category could not be created.
+        updated: That forum category has been updated.
+        not_updated: This forum category could not be updated.
+      categories:
+        edit: Edit
+        delete: Delete
+        category: Category
+        delete_confirm: Are you sure you want to delete this forum category?
+    common:
+      pages: Pages
+    errors:
+      not_signed_in: You must sign in first.
+      access_denied: Access denied.
+    forum:
+      header: "Viewing %{title}"
+      forums: Forums
+      new: Creating a new forum
+      edit: "Editing the %{title} forum"
+      topics_count:
+        zero: 0 topics
+        one: 1 topic
+        other: "%{count} topics"
+      posts_count:
+        zero: 0 posts
+        one: 1 post
+        other: "%{count} posts"
+      moderator_tools: "Moderation Tools"
+    forums:
+      index:
+        title: Forums
+        forum: Forum
+        views: Views
+        last_post: 'Last Post:'
+        none: None
+    topic:
+      headings:
+        topic: Topic
+        latest: Latest
+        posts: Posts
+        views: Views
+      moderation:
+        success: The selected topic has been moderated.
+      reply: Reply
+      quote: Quote
+      delete: Delete
+      created: This topic has been created.
+      new: Creating a new topic
+      edit: Editing topic
+      not_created: This topic could not be created.
+      deleted: Your topic has been deleted.
+      cannot_delete: You cannot delete a topic you do not own.
+      updated: This topic has been updated.
+      not_updated: This topic could not be updated.
+      subscribed: You have subscribed to this topic.
+      unsubscribed: You have unsubscribed from this topic.
+      none: There are no topics in this forum currently.
+      links:
+        new: New topic
+        back_to_topics: Back to topics
+        edit: Edit topic
+      not_found: The topic you are looking for could not be found.
+      hidden:
+        'true': This topic is now hidden.
+        'false': This topic is now visible.
+      locked:
+        'true': This topic is now locked.
+        'false': This topic is now unlocked.
+      pinned:
+        'true': This topic is now pinned.
+        'false': This topic is now unpinned.
+    topics:
+      show:
+        reply: Reply
+        delete: Delete
+        subscribe: Subscribe
+        unsubscribe: Unsubscribe
+        reply_to_topic: Reply to Topic
+        pending_review: This topic is currently pending review. Only the user who created it and moderators can view it.
+      actions:
+        hide:
+          'true': Show this topic
+          'false': Hide this topic
+        lock:
+          'true': Unlock this topic
+          'false': Lock this topic
+        pin:
+          'true': Unpin this topic
+          'false': Pin this topic
+    post:
+      buttons:
+        reply: Post Reply
+        edit: Edit
+      created: Your reply has been posted.
+      new: Post reply
+      edit: Edit
+      not_created: Your reply could not be posted.
+      not_created_topic_locked: You cannot reply to a locked topic.
+      edited: Your post has been edited.
+      not_edited: Your post could not be edited.
+      deleted: Your post has been deleted.
+      deleted_with_topic: Only post in topic deleted. Topic also deleted.
+      cannot_delete: You cannot delete a post you do not own.
+      in_reply_to: In reply to
+    posts:
+      moderation:
+        moderate: Moderate
+        approve: Approve
+        success: The selected posts have been moderated.
+      post:
+        pending_review: This post is currently pending review. Only the user who posted it and moderators can view it.
+    moderation:
+      title: "Moderation tools for %{forum}"
+  helpers:
+    submit:
+      forum:
+        create: Create Forum
+        update: Update Forum
+      topic:
+        create: Create Topic
+        update: Update Topic
+  simple_form:
+    labels:
+      forum:
+        title: Title
+        description: Description
+      topic:
+        subject: Subject
+        locked: Locked
+        pinned: Pinned
+        hidden: Hidden
+        posts:
+          text: Text
+      post:
+        text: Text
+
+  # General stuff
+  time_ago_in_words: "%{time} ago"
+  ago: " ago"
+  ago_by: " ago by"
+  by: by
+  started_by: "Started by "
+  are_you_sure: Are you sure?

data/config/routes.rb

@@ -14,6 +14,14 @@ MongoidForums::Engine.routes.draw do
       post '/add_user' => 'groups#add_member', as: :add_user
       post '/rem_user' => 'groups#remove_member', as: :rem_user
     end
+
+    resources :topics do
+      member do
+        get 'toggle_hide' => 'topics#toggle_hide', :as => 'toggle_hide'
+        get 'toggle_lock' => 'topics#toggle_lock', :as => 'toggle_lock'
+        get 'toggle_pin' => 'topics#toggle_pin', :as => 'toggle_pin'
+      end
+    end
   end
 
   root :to => "forums#index"

data/lib/mongoid_forums/version.rb

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