xforum 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723d2b7e15ed355c4c29a21eceba9c67516bd6cb
-  data.tar.gz: bb2fc6d3f57b5750d34c1b7f3369c91b844a8af8
+  metadata.gz: 3a1dcc8a188dcd60a90b395dadeaa8f10cbd0b96
+  data.tar.gz: ae3817460faacdb80c2a6212ffab8d845dce3b0c
 SHA512:
-  metadata.gz: 5344d51f12484427790faa3a8ffc1c459c373e8b78e6b7352c535e2908ae2b514615d6243b79006746d2fdf2645ce4d35dc3c80ee4758629f6ecdaa4de4a178e
-  data.tar.gz: c629248f8e54077b472928636adae34425b304b74ac16dd98c5f636255214abac908b16221fd2badd7de3de8086dc561bb77919f8f784bd691408edd2d2c9c60
+  metadata.gz: b39c6b96be1cf67148c0ef84ce5d3886420742aec30ed74e12a96be0af2c4e15624258b898581582da3ec31b726339b746043a62ce0b7b3d7ccf8a00c2950d6a
+  data.tar.gz: dc5bff780515da4db1ad790402963bdb434560fc01c587b6f9463621a224a330b35d99b0cbc9826b5af097046bf1c9563ee590ed013aaaeae41351a4ca355657

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

@@ -36,8 +36,23 @@ jQuery ->
     doRestrictCategory(event.target)
   $('#restrict-topic').click ->
     doRestrictTopic(event.target)
+  $('#user_email').dblclick ->
+    addEmail(event.target)
 #todo add reason selection for rejecion (forum and user privilages)
 
+clearEmail=->
+  document.getElementById('forum_selected_emails').innerHTML=''
+
+addEmail=(which)->
+  email_list=document.getElementById('forum_selected_emails')
+  emails=email_list.innerHTML
+  email=which.innerHTML
+  if emails.search(email)>=0
+    emails=emails.replace(email+',\n','')
+  else
+    emails=emails+email+',\n'
+  email_list.innerHTML=emails
+
 doRestrictCategory=(button)->
   if button.value== button.dataset.restrict
     button.value=button.dataset.submit
@@ -46,6 +61,7 @@ doRestrictCategory=(button)->
     button.value= button.dataset.restrict
     hideMe({id:'forum-restricted-list'})
     request={function:'forum admin action'}
+    request.new_category = $('#forum-add-admin-category').val()
     request.forum_action='restrict category'
     request.user_list=$('#forum-restricted-list').val()
     request.category=$('#forum-category-admin').val()
@@ -60,8 +76,10 @@ doRestrictTopic=(button)->
     button.value= button.dataset.restrict
     request={function:'forum admin action'}
     request.forum_action='restrict topic'
-    request.category=$('#forum-topic-admin').val()
+    request.topic=$('#forum-topic-admin').val()
+    request.category=$('#forum-category-admin').val()
     request.user_list=$('#forum-restricted-list').val()
+    request.new_topic = $('#forum-add-admin-topic').val()
     hideMe({id:'forum-restricted-list'})
     hideMe({id:'forum-admin-topic'})
     $.post('xforum/forum_ajax',request)
@@ -116,6 +134,7 @@ doButtonAction = (which)->
 window.doAdminStuff = ->
   document.getElementById('forum-senate').dataset.admining = 'true'
   setAdminDisplay()
+  clearEmail()
   $.post('xforum/forum_ajax',{function:'get list',by_name:false, list:'admin-actions'},loadList)
   $.post('xforum/forum_ajax',{function:'get list',by_name:false, list:'forum-distribution-lists'},loadList)
   $.post('xforum/forum_ajax',{function:'get list',by_name:true, list:'admin-emails'},loadList)
@@ -136,6 +155,7 @@ setAdminDisplay=->
   showMe({id:'forum-distribution-span'})
   hideMe({id:'forum-moderator-add-span'})
   hideMe({id:'forum-restricted-list'})
+  hideMe({name:'forum-act-on-admin-selector'})
   document.getElementById('forum-new-distribution-list').value=''
 
 turnLanguage=(toggle)->
@@ -174,6 +194,7 @@ setTagView = ->
   $('#user-tag').focus()
 
 checkActionSetup = (which)->
+  showMe({name:'forum-act-on-admin-selector'})
   switch which.value
     when 'create distribution'
       setDistributionListView()
@@ -200,6 +221,7 @@ doAction = ->
   request.new_list_name = $('#forum-new-distribution-list').val()
   request.distribution_list = $('#forum-distribution-lists').val()
   request.forum_action = $('#forum-actions').val()
+  request.emails=document.getElementById('forum_selected_emails').innerHTML
   document.getElementById('forum-actions').selectedIndex=0
   setAdminDisplay()
   $("forum-email-body").val('')
@@ -248,7 +270,7 @@ deleteForumObject = (which_one)->
 
 addOptionTo = (which_one,item)->
   switch which_one
-    when 'category'
+    when 'category', 'categories'
       pushOption($('[name=category_admin]'),{item:item,value:item},0)
       pushOption($('[name=category]'),{item:item,value:item},2)
     when 'language'
@@ -268,7 +290,9 @@ addCategory = (which,user)->
     new_category = $('#forum-add-admin-category').val()
     unless new_category == ''
       addListEntry('forum-admins-category-list',{item:new_category})
-      $.post('xforum/forum_ajax',{function:'add to list',list:'category',new_item:new_category,user:$('#forum-add-admin-user').val()})
+      request={function:'add to list',list:'category',new_item:new_category}
+      request.user=$('#forum-add-admin-user').val()
+      $.post('xforum/forum_ajax',request)
       addOptionTo('forum-category',new_category)
     addCancel({obj:which})
 
@@ -371,7 +395,7 @@ window.loadAdminsList = (params)->
       which = 'forum-admins-topic-list'
       short = 0
       shift = true
-    when 'category'
+    when 'category' , 'categories'
       which = 'forum-admins-category-list'
       short = 1
       shift = true

data/app/assets/javascripts/xforum/global_java.js

@@ -14,8 +14,8 @@ function showPageName() {
 function checkPage(page) {
     "use strict";
     var path;
-    path = window.location.href.split("/").pop();
-    return (path === "" || path === page || path === page + '#' || path.length === 2);
+    path = window.location.href;
+    return path.indexOf(page) >= 0;
 }
 
 function whatsup1(message) {

data/app/assets/stylesheets/xforum/custom.css.scss

@@ -55,12 +55,7 @@ $blue: #a0a0ff;
   margin-left:75px;
   margin-top:10px;
 }
-input{
-  border: 1px solid rgb(187, 187, 187);
-  width: 95%;
-  padding: 10px;
-  margin-bottom: 15px;
-}
+
 .senate-row{
   padding:0;
 }

data/app/controllers/xforum/forums_controller.rb

@@ -41,7 +41,7 @@ module Xforum
           render json: Translation.get_translations(params)
         when 'add to list'
           case params[:list]
-            when 'category'
+            when 'category' ,'categories'
               response= Category.add_category(params, current_user)
             when 'topic'
               response= Topic.add_topic(params, current_user)
@@ -85,7 +85,7 @@ module Xforum
           render json: Topic.subscribe(params[:topic], current_user)
         when 'get suggestions'
           case params[:list]
-            when 'category'
+            when 'category' , 'categories'
               response= Category.get_suggestions(params, current_user)
             when 'topic'
               response= Topic.get_suggestions(params, current_user)

data/app/models/xforum/category.rb

@@ -8,7 +8,7 @@ module Xforum
 
     def self.add_category(params,user)
       params[:user.id]=user.id if params[:user_id] == 'me'
-      user.forum_admin? ? id= Category.create(name:params[:new_item],user_id:user.id,suggestion:false).id : id='not happening'
+      user.forum_admin? ? id= Category.create(name:params[:new_item],user_id:user.id).id : id='not happening'
       {id:id}
     end
 
@@ -24,7 +24,9 @@ module Xforum
 
     def self.restrict_me(params,user)
       if user.forum_admin?
-        category=Category.find_by(name:params[:category])
+        params[:new_category].nil? ?
+            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')
@@ -59,6 +61,7 @@ module Xforum
         Category.create(name:'request new category',closed:false,suggestion:false)
         Category.create(name:'select category',closed:false,suggestion:false)
       end
+
       params[:hold_test]=='true' ?
           category_list= Category.grab({closed:false,suggestion:false},[:id,:name,:closed,:restricted],{})   :
           category_list= Category.grab('all',[:id,:name,:closed,:restricted],{})

data/app/models/xforum/forum.rb

@@ -13,10 +13,13 @@ module Xforum
     def self.do_admin_action(params,user)
       params[:users1]=[] if params[:users1].nil?
       params[:users2]=[] if params[:users2].nil?
-      user_ids=(params[:users1] + params[:users2])
-      user_ids.uniq!
-      (0...user_ids.size).each{|i| user_ids[i]=user_ids[i].to_i}
-      user_ids.delete(0)
+      user_ids=[]
+      unless params[:emails].nil?
+        people_emails=params[:emails].split(",\n")
+        people_emails.each{|email|user_ids.push(User.where(email:email).pluck(:id)[0] )  }
+        (0...user_ids.size).each{|i| user_ids[i]=user_ids[i].to_i}
+        user_ids.delete(0)
+      end
       case params[:forum_action]
         when 'suspend posting'
           users_ids.each { |user_id| Xforum.user_class.where(id: user_id).update_all(forum_posting_priviages: false) }

data/app/models/xforum/people_list.rb

@@ -1,4 +1,9 @@
-
+# forum            belongs_to
+# topic            belongs_to
+# category         belongs_to
+# name,            string          limit:20
+# list,            string          limit:20
+# people,          binary          default:[]
 module Xforum
   class PeopleList < ActiveRecord::Base
     require 'json'
@@ -35,11 +40,11 @@ module Xforum
       people
     end
 
-    def self.manage_list(params, user_ids)
+    def self.manage_list(params,user_ids)
       case params[:forum_action]
         when 'create distribution'
           PeopleList.find_or_create_by(name:params[:new_list_name], list:'distribution list'){|list|
-              list.people=params[:people].to_json
+              list.people=user_ids.to_json
           }
         when 'add to distribution'
           alist= user_ids
@@ -80,9 +85,9 @@ module Xforum
     end
 
     def self.get_forum_emails(params, user)
-      user.forum_admin? ? alist=Xforum.user_class.all.pluck(:email, :id) : alist= []
+      user.forum_admin? ? alist=Xforum.user_class.all.order(:email).pluck(:email, :id) : alist= []
       alist.unshift([I18n.t('xForum.select_none'), 'select none', 0])
-      {list_data: ForumAssist.named_array(alist, [:value, :item]), name: 'forum-user-email'}
+      {list_data:ForumAssist.named_array(alist, [:value, :item]), name: 'forum-user-email'}
     end
 
     def self.get_forum_users(params, user)
@@ -91,10 +96,10 @@ module Xforum
       {list_data: ForumAssist.named_array(alist, [:value, :item]), name: 'forum-user-tag'}
     end
 
-    def self.check_restrictions(alist,user_id, list_type)
-      blist=alist.clone
+    def self.check_restrictions(blist,user, list_type)
+      alist=blist.clone  #so you can do list.each and delete items
       blist.each { |record|
-        list.delete(record) if record[:restricted] && PeopleList.check_invitation(record[:id], user_id,list_type)
+        alist.delete(record) if record[:restricted] && PeopleList.check_invitation(record[:id], user.id,list_type)
       }
       alist
     end
@@ -102,12 +107,11 @@ module Xforum
     def self.check_invitation(id,user_id,list_type)
       case list_type
         when 'topic'
-          JSON.load(PeopleList.where(topic_id:id,list:'invitation').people).include(user_id.to_s)
-        when 'category'
-          JSON.load(PeopleList.where(category_id:id,list:'invitation').people).include(user_id.to_s)
+          !JSON.load(PeopleList.where(topic_id:id,list:'invitation')[0].people).include?(user_id.to_s)
+        when 'category', 'categories'
+          !JSON.load(PeopleList.where(category_id:id,list:'invitation')[0].people).include?(user_id.to_s)
         when 'forum'
-          JSON.load(PeopleList.where(forum_id:id,list:'invitation').people).include(user_id.to_s)
-
+          !JSON.load(PeopleList.where(forum_id:id,list:'invitation')[0].people).include?(user_id.to_s)
       end
     end
     def self.get_forum_distribution_lists(params,user)

data/app/models/xforum/topic.rb

@@ -20,7 +20,6 @@ module Xforum
     def self.topics(params,user)
       Topic.create(name:'select topic') if Topic.find_by(name:'select topic').nil?
       Topic.create(name:'request new topic') if Topic.find_by(name:'request new topic').nil?
-
       unless  params[:category] == 'select category'
         category_id=Category.where(name:params[:category]).pluck(:id)[0]
         params[:hold_test]=='true' ?
@@ -50,10 +49,17 @@ module Xforum
 
     def self.restrict_me(params,user)
       if user.forum_admin?
-        topic=Topic.find_by(name:params[:topic])
-        topic.restricted= !topic.restricted
+        if params[:new_topic].nil?
+            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)
+        end
         invitation=PeopleList.find_or_create_by(topic_id:topic.id,list:'invitation')
-        invitation.people= PeopleList.find_by(name:params[:user_list],list:'distribution').people
+        invitation.people= PeopleList.find_by(id:params[:user_list]).people
+        invitation.save
       end
     end
 

data/app/models/xforum/translation.rb

@@ -88,7 +88,7 @@ module Xforum
       alist.each.each {|entry|
         translation=Translation.find_by(forum_id:entry[:id],language_id:language)  unless language.nil?
         case list_name
-          when 'category'
+          when 'category' , 'categories'
             entry.store(:item,Category.where(id:entry[:id]).pluck(:name)[0] )
             entry.store(:value,entry[:item])
           when 'topic'

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

@@ -7,23 +7,23 @@
         <%=select_tag(:users,options_for_select(@forum_actions ), id:'forum-actions', class:'forum-select')%>
         <input class='red-ellipse comment-btn'  type='button' id= "forum-admin-button" name ='forum-act-on-admin-selector' value= "<%= t('xForum.Submit')%>" >
       </span>
-      <span class="col-md-3">
-        <label> <%= t('xForum.User_Name') %> </label> <br><br>
-
-        <button class="cool-selector" name="forum-user-tag-show"><input class= 'silver-selector' type='button' id=  'forum-admin-button' name='forum-user-tag-choose'  value="<%= t('xForum.select_user')%>"></button>
-        <span id='forum-user-tag-span'><%=select_tag(:users,options_for_select(@user_tags ), multiple:true, name:'forum-user-tag',size:6, class:'forum-select')%></span>
-      </span>
-      <span class="col-md-3">
+      <span class="col-md-5">
         <label> <%= t('xForum.User_Email')%>  </label> <br><br>
         <button class="cool-selector" name="forum-user-email-show"><input class= 'silver-selector' type='button' id=  'forum-admin-button' name='forum-user-email-choose'  value="<%= t('xForum.select_user')%>"></button>
         <span id='forum-user-email-span'><%=select_tag(:user_email,options_for_select(@user_email), multiple:true, size:6, name:'forum-user-email', class:'forum-select')%></span>
-      </span>
-      <span class="col-md-3">
+
+        <label> <%= t('xForum.User_Name') %> </label> <br><br>
+        <button class="cool-selector" name="forum-user-tag-show"><input class= 'silver-selector' type='button' id=  'forum-admin-button' name='forum-user-tag-choose'  value="<%= t('xForum.select_user')%>"></button>
+        <span id='forum-user-tag-span'><%=select_tag(:users,options_for_select(@user_tags ), multiple:true, name:'forum-user-tag',size:6, class:'forum-select')%></span>
+     </span>
+      <span class="col-md-4">
         <span id="forum-distribution-span">
           <label> <%= t('xForum.Distribuiton_List_Name')%>  </label> <br><br>
           <%=select_tag(:forum,options_for_select(@distribution_lists),  id:'forum-distribution-lists', class:'forum-select')%>
           <label><%=t('xForum.New')%></label> <input type="text" id='forum-new-distribution-list' class="admin-edit-field"  >
-        </span>
+          <label><%=t('xFrorum.User_Email')%></label>
+            <%=text_area_tag(:forum_selected_emails )%>
+            </span>
         <span id="forum-moderator-add-span">
           <label> <%= t('xForum.Add_Topic_Monitor')%>  </label> <br><br>
           <%= select_tag(:forum, options_for_select(@categories),id:'forum-category-monitor', class: 'forum-select') %>

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

metadata

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