xforum 0.0.379 → 0.0.381

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0adcc543103cd2ecc60621a2a9562d60a17f3679
-  data.tar.gz: d5c9997eb2f6fbbdeee66601090624d2f175bc82
+  metadata.gz: 16d11219db1b75ff631adc09c42f09a6cf1c4cf7
+  data.tar.gz: 28207bcf3dc34899a741edb41fd70f0f01541675
 SHA512:
-  metadata.gz: 51501c9774888f987bd8e8ca140d4d5890532b3c72eaaae26e3af917d49987bbd96683b98c59463ac0c68bcd0ab278bbbb82f686de9540cce6f98e2f9b7379a5
-  data.tar.gz: 0a3cce0442be303763cf4c64df3e66d913a8c4c4c6a9528cee5c8585958648eb7dc150846cbb670068a4059fa1682671cfd02c6714782a7f8c50dce11f860b5a
+  metadata.gz: 5049d0f28b790c30ad084a6e99c1ee9094cce9270f64b40d15ff987684b211c2067c9b73012dce45d15b53ca806bd24b44b125b01f148a06023ec0ce40efd528
+  data.tar.gz: c2be7d2c4b3dae53dc1b8814d395858b5b06f60fa007a358d8547b689519a4a565bab10dab0a3ef153fc4bc18507512fadfe717bc54743ac294d061d3a99ef4f

data/app/models/xforum/forum.rb

@@ -45,14 +45,14 @@ module Xforum
       if params[:topic]== 'select topic'
         return
       end
-      topic=Topic.where(name:params[:topic]).pluck(:id)[0]
-      category=Category.find_by(topic_id:topic.id)
+      topic=Topic.find_by(name:params[:topic])
+      category=Category.find_by(id:topic.category_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
-        index=Forum.clear_user_topic(user.id,topic_id)
+        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

data/app/models/xforum/people_list.rb

@@ -106,10 +106,9 @@ module Xforum
       {list_data: ForumAssist.named_array(alist, [:value, :item]), name: params[:list]}
     end
 
-    def self.check_restrictions(alist, user, list_type)
-      blist=[]
-      byebug
-      alist.each { |record|
+    def self.check_restrictions(blist, user, list_type)
+      alist=blist.clone  #so you can do list.each and delete items
+      blist.each { |record|
         skip=false
         case list_type
           when 'topic'
@@ -119,14 +118,15 @@ module Xforum
         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
-          blist.push(record) unless record[:restricted] && PeopleList.check_invitation(record[:name],record[:id], user.id, list_type)
+          alist.delete(record) if record[:restricted] && PeopleList.check_invitation(record[:name],record[:id], user.id, list_type)
         end
       }
-      blist
+      alist
     end
 
     def self.check_invitation(name,id,user_id,list_type)

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.379'
+  VERSION = '0.0.381'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.379
+  version: 0.0.381
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3