xforum 0.0.377 → 0.0.378

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ece98c3b431521e44c2a1d790696102977f8a02
-  data.tar.gz: c85eccdd20ddfe8d299650d4bd8d9a9ec643b591
+  metadata.gz: dae03aab9ce8e977a3e0f3bfb93302f79ae22c19
+  data.tar.gz: 4aaef04977c9b85b089b2d97ec9edbb26ecd729b
 SHA512:
-  metadata.gz: 2d7c3f3b22d85f99184e955db7e4b6b46e00416e4dbafa2401e24d3bc5955b34b3cbb77f0d7a0b130bf33ed4bbd6cce545a534f2eab7d7303719ed0d4bbc23ba
-  data.tar.gz: 7a606bca17df8ddcb1a9ddeaf8804ae774f723ebf2caa3b7f00881fe6c21ef028c5af78b1404d5656edf339c45a7c73ea858bf84a9c2374692718e460b4dc6b7
+  metadata.gz: a53991fdedd1e62337305e941e3ff82325040d9938ac4fb34fc87e3fd94f3eca4f5067e1c0b58235db3b97c64ead9d1a5b0cea85910a8fa82c817fc494841a81
+  data.tar.gz: c1b5e4a2da97b07d458eedba08faa24813c62a46f98ff013770b4b0645df160f6583d47d0cf4e56753e5a3539b697cff68f453051d69b5448eb3d4bc3cb9e81f

data/app/assets/javascripts/xforum/forum_admin.js.coffee

@@ -241,12 +241,14 @@ doAction = ->
   request.new_list_name = $('#forum-new-list').val()
   request.distribution_list = $('#forum-distribution-lists').val()
   request.the_list=$('#forum-every-list').val()
-  request.list_type=$('forum-list-type').val()
+  request.list_type=$('#forum-list-type').val()
   request.forum_action = $('#forum-actions').val()
   document.getElementById('forum-actions').selectedIndex=0
   setAdminDisplay()
   $("forum-email-body").val('')
   $.post('xforum/forum_ajax',request)
+  doAdminStuff()
+  hideActionViews()
 
 setAdminView = (which_one)->
   switch(which_one.dataset.view)

data/app/controllers/xforum/forums_controller.rb

@@ -5,7 +5,7 @@ module Xforum
   class ForumsController < ApplicationController
 
     def the_page
-      gon.forum_user=[]
+
     end
 
     def forum_ajax

data/app/models/xforum/category.rb

@@ -24,22 +24,29 @@ module Xforum
 
     def self.restrict_me(params,user)
       if user.forum_admin?
-        (params[:new_category].nil? || params[:new_category]=='')  ?
-            category=Category.find_by(name: params[:category]) :
-            category=Category.create(name: params[:new_category], user_id: user.id)
-        category.restricted= !category.restricted
-        category.save
-        invitation=PeopleList.find_or_create_by(category_id:category.id,list:'invitation')
-        invitation.people= PeopleList.find_by(id:params[:user_list]).people
-        invitation.save
+        category=Category.find_by(name: params[:category])
+        unless category.nil?
+          unless params[:user_list].nil? || params[:user_list]=='select list'
+            people_list=PeopleList.find_by(id:params[:user_list])
+            if people_list.category_id.nil? && people_list.list =='invitation'
+              people_list.update(category_id:category.id )
+            else
+              new_list=people_list.clone
+              new_list.name=category.name+'-invitees'
+              new_list.list='invitation'
+              new_list.category_id=category.id
+            end
+          end
+          category.update(restricted:!category.restricted)
+        end
       end
     end
 
     def self.get_suggestions(params,user)
-        data= Category.where(suggestion:true).pluck(:name, :user_id,:id)
-        data=ForumAssist.named_array(data, [:suggestion, :user,:id]) unless data.empty?
-        data=ForumAssist.add_user_name(data.clone) unless data.empty?
-        user.forum_admin? ? {data: data, list: 'forum-category-prososals-list'} : {response: 'nothing doing'}
+      data= Category.where(suggestion:true).pluck(:name, :user_id,:id)
+      data=ForumAssist.named_array(data, [:suggestion, :user,:id]) unless data.empty?
+      data=ForumAssist.add_user_name(data.clone) unless data.empty?
+      user.forum_admin? ? {data: data, list: 'forum-category-prososals-list'} : {response: 'nothing doing'}
     end
 
     def self.edit_category(params,user)

data/app/models/xforum/forum.rb

@@ -43,34 +43,40 @@ module Xforum
 
     def self.senate(params,user)
       if params[:topic]== 'select topic'
+        return
+      end
+      topic=Topic.where(name:params[:topic]).pluck(:id)[0]
+      category=Category.find_by(topic_id:topic.id)
+      if (category.private || !user.forum_admin?) && PeopleList.check_invitation(category.name,category.id, user.id, 'category')
+        {to_do:'nothing'}
+      elsif  (topic.restricted && !user.forum_admin?) && PeopleList.check_invitation(topic.name,topic.id, user.id, 'topic')
         {to_do:'nothing'}
       else
-        topic_id=Topic.where(name:params[:topic]).pluck(:id)[0]
         index=Forum.clear_user_topic(user.id,topic_id)
         the_list=[]
         plucking=       [:id, :parent, :content, :user_id,:owner_name,:state,:restricted,:tag,:has_photo]
         plucking_names= [:id, :parent, :content,:owner,:owner_name,:comment_state,:restricted,:tag,:has_photo,:needs_translation,:empty_list] #we're going to append empty list to the reply
-        moderator=PeopleList.check_people({topic:topic_id,user_id:user.id,list:'moderator'}) || user.forum_admin?
+        moderator=PeopleList.check_people({topic:topic.id,user_id:user.id,list:'moderator'}) || user.forum_admin?
         if params[:review]=='true' && moderator
-          test=Forum.where(topic_id:topic_id,state:'new').pluck(:id)
+          test=Forum.where(topic_id:topic.id,state:'new').pluck(:id)
           unless test.empty?
-            item1=ForumAssist.named_array(Translation.get_localized_forum(Language.get_me(params),{lookup:{topic_id:topic_id},plucking:plucking,size:0}),plucking_names)
+            item1=ForumAssist.named_array(Translation.get_localized_forum(Language.get_me(params),{lookup:{topic_id:topic.id},plucking:plucking,size:0}),plucking_names)
             item1.store(:moderator,true)
             item1.store(:review,true)
-            new_list=  ForumAssist.named_array( Translation.get_localized_forum(Language.get_me(params),{lookup:{topic_id:topic_id,state:'new'},ordering:([:topic_id]),plucking:plucking,size:'all'}),plucking_names )
+            new_list=  ForumAssist.named_array( Translation.get_localized_forum(Language.get_me(params),{lookup:{topic_id:topic.id,state:'new'},ordering:([:topic_id]),plucking:plucking,size:'all'}),plucking_names )
             new_list.unshift(item1)
             the_list=new_list
           end
         else
-          senate_list=ForumAssist.named_array(Translation.get_localized_forum(Language.get_me(params),{lookup:{topic_id:topic_id,hold:false},ordering:[:parent,:created_at],plucking:plucking,size:'all'}), plucking_names )
+          senate_list=ForumAssist.named_array(Translation.get_localized_forum(Language.get_me(params),{lookup:{topic_id:topic.id,hold:false},ordering:[:parent,:created_at],plucking:plucking,size:'all'}), plucking_names )
           if senate_list.nil? || senate_list.empty?
             []
           else
-            voting=Topic.grab({id:topic_id},[:vote,:votes],{})[0]
+            voting=Topic.grab({id:topic.id},[:vote,:votes],{})[0]
             voting[:vote] ? votes=Topic.count_votes(JSON.load(voting[:votes])) : votes=0
             parent=Forum.look_for_key(senate_list,:parent,0)
             new_list=[]
-            subscribed=PeopleList.check_people({topic:topic_id,user_id:user.id,list:'subscribers'})
+            subscribed=PeopleList.check_people({topic:topic.id,user_id:user.id,list:'subscribers'})
             parent=set_new_senate_entry(senate_list,new_list,parent,user.id, {moderator:moderator,vote:voting[:vote],votes:votes,subscribed:subscribed,admin:user.forum_admin?}) unless parent.nil?
             Forum.is_child_there?(senate_list,new_list,0,parent,user.id)        #push first child
             new_list.delete_if  {|record|
@@ -79,7 +85,7 @@ module Xforum
                 case record[:state]
                   when 'reject' then  test= true
                   when 'new'
-                    ENV['XFORUM_NEW_RULE']=='no' || Topic.where(id:topic_id).is_moderated
+                    ENV['XFORUM_NEW_RULE']=='no' || Topic.where(id:topic.id).is_moderated
                   else  test=false
                 end
               end

data/app/models/xforum/people_list.rb

@@ -67,12 +67,13 @@ module Xforum
       alist.unshift([I18n.t('xForum.select_none'), 'select none', 0])
       {list_data:ForumAssist.named_array(alist, [:value, :item]), name:params[:list]}
     end
-    def self.get_people_list(params)
-      which=PeopleList.get_which_owner(params)
-      params.merge!(which)
-      people_object=PeopleList.make_a_list(params)
-      list=JSON.load(people_object.people)
-      list.nil? ? [] : list
+    def self.get_voter_list(params)
+      unless params[:topic_id].nil?
+        people_list=PeopleList.find_or_create_by(topic_id:params[:topic_id],list:'voters'){ |me|
+          me.name=Topic.where(id:topic_id).pluck(:name)[0] +'-voters'
+        }
+        JSON.load(people_list.people)
+      end
     end
 
     def self.make_a_list(params)
@@ -80,7 +81,7 @@ module Xforum
         joe.topic_id=params[:topic_id] unless  params[:topic_id].nil?
         joe.category_id=params[:topic_id] unless params[:category_id].nil?
         joe.forum_id =params[:topic_id] unless params[:forum_id].nil?
-        joe.list = params[:list]
+        joe.list ='voters'
       }
     end
 
@@ -96,7 +97,6 @@ module Xforum
       end
     end
 
-
     def self.get_forum_users(params, user)
       user.forum_admin? ? alist = Xforum.user_class.all.order(:forum_post_name).pluck(:forum_post_name, :id) : alist =[]
       alist.unshift([I18n.t('xForum.select_none'), 'select none', 0])
@@ -109,35 +109,65 @@ module Xforum
     def self.check_restrictions(blist, user, list_type)
       alist=blist.clone  #so you can do list.each and delete items
       blist.each { |record|
-        alist.delete(record) if record[:restricted] && PeopleList.check_invitation(record[:id], user.id,list_type)
+        skip=false
+        case list_type
+          when 'topic'
+            category= Category.find_by(id:record[:category_id])
+          when 'category','categories'
+            category= Category.find_by(id:record[:id])
+        end
+        if !category.nil? && category.restricted
+          if PeopleList.check_invitation(record[:name],category.id, user.id, 'category')
+            alist.delete(record)
+            skip=true
+          end
+        end
+        unless skip
+          alist.delete(record) if record[:restricted] && PeopleList.check_invitation(record[:name],record[:id], user.id, list_type)
+        end
       }
       alist
     end
 
-    def self.check_invitation(id,user_id,list_type)
+    def self.check_invitation(name,id,user_id,list_type)
       case list_type
         when 'topic'
-          !JSON.load(PeopleList.where(topic_id:id,list:'invitation')[0].people).include?(user_id)
+          people_list=PeopleList.find_by(topic_id:id,list:'invitation')
         when 'category', 'categories'
-          !JSON.load(PeopleList.where(category_id:id,list:'invitation')[0].people).include?(user_id)
+          people_list=PeopleList.find_by(category_id:id,list:'invitation')
         when 'forum'
-          !JSON.load(PeopleList.where(forum_id:id,list:'invitation')[0].people).include?(user_id)
+          people_list=PeopleList.find_by(forum_id:id,list:'invitation')
         else
-          true
+          nil
       end
+      people_list.nil? ? false : !JSON.load(people_list.people).include?(user_id)
     end
+
     def self.get_forum_people_lists(params,user)
       case params[:list]
         when 'forum-distribution-lists'
-          alist=PeopleList.where(list:'distribution list').pluck(:name, :id)
+          alist=PeopleList.grab({list:'distribution'},[:id,:name,:private,:people],{})
         when  'forum-restricted-list'
-            alist=PeopleList.where(list:'invitation').pluck(:name, :id)
+          alist=PeopleList.grab({list:'invitation'},[:id,:name,:private,:people],{})
         when 'forum-every-list'
-            alist=PeopleList.where(private:false).pluck(:name, :id)
+          alist=PeopleList.grab('all',[:id,:name,:private,:people],{})
         else
       end  if user.forum_admin?
-      alist.unshift([I18n.t('xForum.select_list'), 'select list', 0]) unless alist.nil?
-      {list_data: ForumAssist.named_array(alist, [:value, :item]), id:params[:list]}
+      if alist.nil? || alist.empty?
+        []
+      else
+        blist=alist.clone
+        alist.each{|record|
+          blist.delete(record) if record[:private] && !JSON.load(record[:people]).include?(user.id)
+        }
+        clist=[]
+        blist.each{|record|
+          clist.push({value:record[:name],item:record[:id]})
+        }
+        clist.unshift({value:I18n.t('xForum.select_list'),item:'select list'})
+
+        {list_data:clist, id:params[:list]}
+      end
     end
 
     def self.get_this_list(user,params)
@@ -145,6 +175,7 @@ module Xforum
         {list:JSON.load(PeopleList.find_by(id:params[:list_id].to_i).people)}
       end
     end
+
     def self.is_a_moderator?(user_id)
       the_lists=PeopleList.where(list: 'moderator').pluck(:people)
       moderators=[]
@@ -157,11 +188,11 @@ module Xforum
 
     def self.make_invitation(params, forum_id, user)
       invitees=PeopleList.get_people_id_list(user.id, params[:invitees])
-      peoplelist=PeopleList.where(list: 'invitation', owner_id: forum_id).first_or_create { |invitation|
+      people_list=PeopleList.where(list: 'invitation', owner_id: forum_id).first_or_create { |invitation|
         invitation.owner_id=forum_id
         invitation.list='invitation'
       }
-      peoplelist.invite_these_guys(invitees)
+      people_list.invite_these_guys(invitees)
     end
 
     def self.add_to_list(params,users)
@@ -171,8 +202,8 @@ module Xforum
           new.owner_id=params[:owner]
         }
       else
-        a_list=PeopleList.where(list: 'distribution list', name: params[:list]).first_or_create { |new|
-          new.list = 'distribution list'
+        a_list=PeopleList.where(list: 'distribution', name: params[:list]).first_or_create { |new|
+          new.list = 'distribution'
           new.name = params[:list]
         }
       end

data/app/models/xforum/topic.rb

@@ -23,12 +23,12 @@ module Xforum
       unless  params[:category] == 'select category'
         category_id=Category.where(name:params[:category]).pluck(:id)[0]
         params[:hold_test]=='true' ?
-            topics=Topic.grab({category_id:category_id,closed:false,suggestion:false},  [:id,:name,:state,:restricted,:closed,:is_moderated],{swap:{name: :item}})  :
-            topics=Topic.grab({category_id:category_id}, [:id,:name,:state,:restricted,:closed,:is_moderated],{swap:{name: :item}})
+            topics=Topic.grab({category_id:category_id,closed:false,suggestion:false},  [:id,:name,:state,:category_id,:restricted,:closed,:is_moderated],{swap:{name: :item}})  :
+            topics=Topic.grab({category_id:category_id}, [:id,:name,:state,:category_id,:restricted,:closed,:is_moderated],{swap:{name: :item}})
         topics=[] if topics[0][:id].nil?
         topics=PeopleList.check_restrictions(topics,user,'topic')
-        a=Topic.grab({name:'select topic'},[:id,:name,:state,:restricted,:closed],{swap:{name: :item}})[0]
-        b=Topic.grab({name:'request new topic'}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})[0]
+        a=Topic.grab({name:'select topic'},[:id,:name,:state,:category_id,:restricted,:closed],{swap:{name: :item}})[0]
+        b=Topic.grab({name:'request new topic'}, [:id,:name, :category_id,:state,:restricted,:closed],{swap:{name: :item}})[0]
         topics.unshift(a)
         topics.push(b)
         {list_data:Translation.translate_list(topics,params[:language],'topic'),id:params[:list]}
@@ -49,17 +49,19 @@ module Xforum
 
     def self.restrict_me(params,user)
       if user.forum_admin?
-        if params[:new_topic].nil? || params[:new_topic]==''
-            topic=Topic.find_by(name:params[:topic])
-            topic.restricted= !topic.restricted
-        else
-          category=Category.where(name:params[:category]).pluck(:id)[0]
-          topic=Topic.create(name:params[:new_topic],user_id:user.id,category_id:category,restricted:true)
-          Forum.add_comment({topic:params[:new_topic],comment:params[:new_topic],parent:0},user)
+        topic=topic.find_by(name:params[:topic])
+        unless topic.nil?
+          unless params[:user_list].nil? || params[:user_list]=='select list'
+            people_list=PeopleList.find_by(id:params[:user_list])
+            if people_list.topic_id.nil? && people_list.list=='invitation'
+              people_list.update(topic_id:topic.id )
+            else
+              new_list=people_list.clone
+              new_list.update(name:topic.name+'-invitees',list:'invitation',topic_id:topic.id)
+            end
+          end
+        topic.update(restricted:!topic.restricted)
         end
-        invitation=PeopleList.find_or_create_by(topic_id:topic.id,list:'invitation')
-        invitation.people= PeopleList.find_by(id:params[:user_list]).people
-        invitation.save
       end
     end
 
@@ -95,7 +97,7 @@ module Xforum
 
     def self.cast_vote(topic,user,vote)
       topic_record=Topic.find_by(name:topic)
-      voters=PeopleList.get_people_list({topic:topic_record.id,list:'voters'})
+      voters=PeopleList.get_voter_list({topic:topic_record.id,list:'voters'})
       votes=JSON.load(topic_record.votes)
       if voters.empty?
         index=nil

data/app/views/xforum/admin_lists/_admin_users.html.erb

@@ -22,8 +22,7 @@
           <%=select_tag(:forum,options_for_select(@every_list),  id:'forum-every-list', class:'forum-select')%> <br>
           <span id="editing-every-list-entries">
              <br><label><%=t('xForum.new_list_name')%></label> <input type="text" id='forum-new-list' class="admin-edit-field"  >
-            <br><label><%=t('xForum.new_list_type')%></label> <input type="text" id='forum-list-type' class="admin-edit-field"  >
-
+            <br><label><%=t('xForum.new_list_type')%></label>  <%= select_tag(:forum, options_for_select(@list_types), id:'forum-list-type', class: 'forum-select') %>
           </span>
 
           <label><%=t('xForum.user_email')%></label>

data/app/views/xforum/forums/_forum.html.erb

@@ -4,6 +4,7 @@
   <%@user_tags=[]  %>
   <%@user_email=[]%>
   <%@every_list=[] %>
+  <%@list_types=['invitation','distribution']%>
   <%if Xforum::Language.first.nil?  then Xforum::Language.init_language_set end %>
   <%unless ENV['XFORUM_LANGUAGES'].nil? then @languages= Xforum::Language.languages({active:'true',list:'forum-language'})[:list_data] end %>
   <%@aphoto= 'photo' %>

data/db/migrate/{20140826100001_add_private_to_people_lists.rb → 20140826100002_add_private_to_people_lists.rb}

@@ -1,5 +1,5 @@
 class AddPrivateToPeopleLists < ActiveRecord::Migration
   def change
-    add_column :xforum_people_lists,:private,  :boolean, default:false
+    add_column :xforum_categories,:private,  :boolean, default:false
   end
 end

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.377'
+  VERSION = '0.0.378'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.377
+  version: 0.0.378
 platform: ruby
 authors:
 - Robert D Blanton
@@ -252,7 +252,7 @@ files:
 - db/migrate/20140603_change_suggestion_default.rb
 - db/migrate/20140604_add_has_video_to_photo.rb
 - db/migrate/20140813300_add_is_moderated_to_category_topics.rb
-- db/migrate/20140826100001_add_private_to_people_lists.rb
+- db/migrate/20140826100002_add_private_to_people_lists.rb
 - lib/active_record_extension.rb
 - lib/tasks/xforum_tasks.rake
 - lib/xforum.rb