xforum 0.0.374 → 0.0.375

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1148c48e8be550b51b89135091ca7d5d55f4e822
-  data.tar.gz: b518bc09e0ea76bf5184f0640a97dea6894e098a
+  metadata.gz: 3ebc3a0dddf75b8269f9db96ef71e8741b2e99cb
+  data.tar.gz: 554035a6c0b42b7a4774977dac0840ec2ab9f597
 SHA512:
-  metadata.gz: a0580d9bdfb82172c83a8808f5617143889b73a02af255cafbbb1e7df8e039d566b849f1195d2934c5b2b034d68e175891570df64872a81f62db3890f09d9b7d
-  data.tar.gz: 205f76c4560c6552bdd96d74452d2ada20082442860ad29008d3aedf4b9b98a3c47687b975bcecf3d73f1363a0fc56b56b54bf972e332dc312e206ac8d1c318c
+  metadata.gz: f8fe36397028e44855d53468a58db90c8aac7df164177cb307f4141472d96938058b6d0682f95443eda73bf384bee06d8e8027411dcfa685f107a25d860dd79e
+  data.tar.gz: 86ecd69806c057a5ead2ddbcee3699e66113e0173a0d890d1b056ea47cc0f82af9bc29f876994e641e959e39e9badaec33796566f390fc764f998f882db80488

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

@@ -20,42 +20,30 @@ jQuery ->
   $('#forum-box').delegate 'input[id = forum-admin-button]','click', (evt) ->
     doButtonAction(event.target)
     event.stopPropagation()
-  $('#forum-senate-admin-users').delegate '[id = forum-admin-list-option]','click', (evt) ->
-    setSelections(event.target)
+  $('#forum-senate-admin-users').delegate '[id = forum-admin-list-option]','dblclick', (evt) ->
+    addEmail(event.target)
   $('#forum-senate-admin-lists').delegate '[id = set-moderation]','click', (evt) ->
     changeModeration(event.target)
   $('#forum-category-admin').change ->
     getAdminsTopic()
+  $('#forum-every-list').change ->
+    setEditListUp(event.target)
   $('#forum-actions').change ->
     checkActionSetup(event.target)
   $('#forum-admin-language-select').change ->
     flipLanguage(event.target)
-  $('#forum-actions').change ->
-    handleActionChange(event.target)
   $('#forum-category-monitor').change ->
     monitorNewTopic()
   $('#restrict-category').click ->
     doRestrictCategory(event.target)
   $('#restrict-topic').click ->
     doRestrictTopic(event.target)
-  $('#user_email').dblclick ->
+  $('#forum-user-emails').dblclick ->
     addEmail(event.target)
-  $('#users').dblclick ->
+  $('#forum-users-names').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
@@ -96,12 +84,6 @@ monitorNewTopic=->
 getAdminCategory=->
   document.getElementById('forum-category-admin').value
 
-handleActionChange=(which)->
-  switch which.value
-    when 'send email to'
-      showMe({id:"forum-email-email"})
-    else
-      hideMe({id:"forum-email-email"})
 
 doButtonAction = (which)->
   switch(which.name)
@@ -139,12 +121,12 @@ 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)
-  $.post('xforum/forum_ajax',{function:'get list',by_name:true, list:'admin-users'},loadList)
-  $.post('xforum/forum_ajax',{function:'get list',by_name:false, list:'forum-restricted-list'},loadList)
-
+  $.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:'forum-user-emails'},loadListPlus)
+  $.post('xforum/forum_ajax',{function:'get list', by_name:true,  list:'forum-user-names'},loadListPlus)
+  $.post('xforum/forum_ajax',{function:'get list', by_name:false, list:'forum-restricted-list'},loadList)
+  $.post('xforum/forum_ajax',{function:'get list', by_name:false, list:'forum-every-list'},loadList)
 
 setAdminDisplay=->
   hideModerating()
@@ -157,28 +139,15 @@ setAdminDisplay=->
   showMe({name: 'forum-user-email-show'})
   hideMe({id:'forum-admin-topic'})
   showMe({name: 'forum-user-tag-show'})
-  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=''
+  document.getElementById('forum-new-list').value=''
 
 turnLanguage=(toggle)->
   showMe({id:'language-selector-span'})
   $.post('xforum/forum_ajax',{function:'get language set',list:'forum-admin-language-select',active:toggle =='off'},loadList)
 
-setSelections = (which)->
-  if which.value == 'select none'
-    hideMe({obj:which.parentNode.parentNode})
-    name=which.parentNode.name + '-show'
-    showMe({name:name})
-  selections = getSelectValues({name:'forum-user-tag',ref:true})
-  selections= selections.concat(getSelectValues({name:'forum-user-email',ref:true}))
-  selector=   $('[name=forum-email-selections]')
-  selector.children().remove()
-  for i in [0...selections.length]
-    unless selections[i]=='select none'
-      pushOption(selector,{value:selections[i]})
 
 setEmailView = ->
   blockMe({id:'forum-user-email-span'})
@@ -186,11 +155,16 @@ setEmailView = ->
   $('#forum-user-email').focus()
 
 setMonitorView=->
+  hideMe({id:'forum-every-list-span'})
   hideMe({id:'forum-distribution-span'})
   showMe({id:'forum-moderator-add-span'})
 
-setDistributionListView=->
-  showMe({id:'forum-distribution-span'})
+setEveryListView=(which)->
+  showMe({id:'forum-every-list-span'})
+  if which=='edit list'
+    hideMe({id:'editing-every-list-entries'})
+  else
+    showMe({id:'editing-every-list-entries'})
   hideMe({id:'forum-moderator-add-span'})
 
 setTagView = ->
@@ -201,11 +175,20 @@ setTagView = ->
 checkActionSetup = (which)->
   showMe({name:'forum-act-on-admin-selector'})
   switch which.value
-    when 'create distribution'
-      setDistributionListView()
+    when 'create list','edit list'
+      setEveryListView(which.value)
     when 'add topic monitor'
       setMonitorView()
+    when 'send email to'
+      showMe({id:"forum-email-email"})
     else
+      hideActionViews()
+
+hideActionViews=->
+  hideMe({id:"forum-email-email"})
+  hideMe({id:'forum-every-list-span'})
+  hideMe({id:'forum-distribution-span'})
+  hideMe({id:'forum-moderator-add-span'})
 
 flipLanguage=(selector)->
   select = getSelectValues({obj:selector,ref:false})
@@ -213,20 +196,54 @@ flipLanguage=(selector)->
   selector.selectedIndex=0
   hideMe({id:'language-selector-span'})
 
+setEditListUp=(selector) ->
+  the_list= getSelectValues({obj:selector,ref:false})[0]
+  $.post('xforum/forum_ajax',{function:'get this list',list_id:the_list},displayTheList)
+
+displayTheList=(params)->
+  emails=''
+  for i in [0...params.list.length]
+    ref=forum_user_email_ids.indexOf(params.list[i] )
+    email=forum_user_emails[ref]
+    emails=emails+email+',\n'
+  document.getElementById('forum-selected-emails').innerHTML=emails
+
+
+clearEmail=->
+  document.getElementById('forum-selected-emails').innerHTML=''
+
+addEmail=(which)->
+  email_list=document.getElementById('forum-selected-emails')
+  emails=email_list.innerHTML
+  id=parseInt(which.value)
+  ref=0
+  if which.parentNode.name=='forum-user-emails'
+    email=which.innerHTML
+  else
+    ref=forum_user_email_ids.indexOf(id)
+    email=forum_user_emails[ref]
+  flashMe('alert','my email ' + id + ', ' + ref + ', ' + email)
+
+  if emails.search(email)>=0
+    emails=emails.replace(email+',\n','')
+  else
+    emails=emails+email+',\n'
+  email_list.innerHTML=emails
+
 doAction = ->
   request={}
   request.function = 'forum admin action'
-  request.users1 = getSelectValues({name:'forum-user-tag',ref:false})
-  request.users2 = getSelectValues({name:'forum-user-email',ref:false})
+  request.user_emails = document.getElementById('forum-selected-emails').innerHTML
   request.subject = $('#forum-email-subject').val()
   request.body= $('#forum-email-body').val()
   request.topic=$('#forum-topic-monitor').val()
   $('#forum-email-body').val('')
   $('#forum-email-subject').val('')
-  request.new_list_name = $('#forum-new-distribution-list').val()
+  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.forum_action = $('#forum-actions').val()
-  request.emails=document.getElementById('forum_selected_emails').innerHTML
   document.getElementById('forum-actions').selectedIndex=0
   setAdminDisplay()
   $("forum-email-body").val('')

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

@@ -57,6 +57,11 @@ playVideo=(params)->
 
 
 window.startForum = ->
+  window.forum_user_emails=[]
+  window.forum_user_names=[]
+  window.forum_user_email_ids=[]
+  window.forum_user_name_ids=[]
+
   hideMe({id: showPageName()})
   showForumElements()
   pages=  document.getElementById('xforum-help-pages')
@@ -121,6 +126,12 @@ loadCustomList=(params)->
       option.classList.add('drop-menu')
 
 window.loadList = (params)->
+  loadListData(params,false)
+
+window.loadListPlus = (params)->
+  loadListData(params,true)
+
+window.loadListData=(params,global) ->
   if params? && params.list_data?
     list_data = params.list_data
     if params.name != undefined
@@ -130,12 +141,23 @@ window.loadList = (params)->
     else if params.obj !=undefined
       selector=$(params.obj)
     selector.children().remove()
+    switch selector[0].name
+      when 'forum-user-emails'
+        g_list=forum_user_emails
+        g_list_ids=forum_user_email_ids;
+      when 'forum-user-names'
+        g_list=forum_user_names
+        g_list_ids=forum_user_name_ids
+
     if list_data.length==0
       hideMe({obj:selector})
     else
       for i in [0...list_data.length]
         unless list_data[i].state == 'closed'
           pushOption(selector,list_data[i], 0)
+          if global
+            g_list.push(list_data[i].value)
+            g_list_ids.push(list_data[i].item)
 
 window.pushOption = (q_selector,data,offset)->
   selector=q_selector.get()[0]
@@ -148,7 +170,7 @@ window.pushOption = (q_selector,data,offset)->
         option = document.createElement("option")
         option.text = data.value
     option.value = data.item
-    option.id =  'forum-admin_lists-option'
+    option.id =  'forum-admin-list-option'
     ref = selector.children[selector.children.length - offset]
     if ref==undefined
       selector.appendChild(option)

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

@@ -85,7 +85,7 @@ $blue: #a0a0ff;
 }
 .forum-senate{
   width:100%;
-  height:570px;
+  height:530px;
   background:rgb(240, 240, 240);
   overflow-y: scroll;
   padding:20px;

data/app/controllers/xforum/forums_controller.rb

@@ -5,6 +5,7 @@ module Xforum
   class ForumsController < ApplicationController
 
     def the_page
+      gon.forum_user=[]
     end
 
     def forum_ajax
@@ -13,14 +14,11 @@ module Xforum
           case params[:list]
             when 'admin-actions' then
               render json: Forum.get_forum_actions(params, current_user)
-            when 'admin-users' then
-              render json: PeopleList.get_forum_users(params, current_user)
-            when 'admin-emails' then
-              render json: PeopleList.get_forum_emails(params, current_user)
-            when 'forum-distribution-lists', 'forum-restricted-list' then
-              render json: PeopleList.get_forum_distribution_lists(params,current_user)
             else
+              render json: PeopleList.get_a_list(params,current_user)
           end
+        when 'get this list'
+          render json: PeopleList.get_this_list(current_user,params)
         when 'get video'
           render json: Photo.get_video(params)
         when 'forum admin action'

data/app/models/xforum/category.rb

@@ -61,7 +61,6 @@ 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,:is_moderated],{})   :
           category_list= Category.grab('all',[:id,:name,:closed,:restricted,:is_moderated],{})

data/app/models/xforum/forum.rb

@@ -14,11 +14,10 @@ module Xforum
       params[:users1]=[] if params[:users1].nil?
       params[:users2]=[] if params[:users2].nil?
       user_ids=[]
-      unless params[:emails].nil?
-        people_emails=params[:emails].split(",\n")
+      unless params[:user_emails].nil?
+        people_emails=params[:user_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'
@@ -28,7 +27,7 @@ module Xforum
           users_ids.each { |user_id| Xforum.user_class.where(id: user_id).update_all(forum_posting_priviages: false) }
         when 'send email to'
           UserMailer.note_to_forum_users(params, user_ids).deliver
-        when 'create distribution', 'add to distribution', 'remove from distro'
+        when 'create list', 'edit list'
           PeopleList.manage_list(params, user_ids)
         when 'add topic monitor'
           Topic.add_topic_monitor(params, user_ids)
@@ -187,8 +186,8 @@ module Xforum
         alist.push(['suspend posting',I18n.t('xForum.suspend_posting')])
         alist.push(['suspend all',I18n.t('xForum.suspend_all')])
         alist.push(['send email to',I18n.t('xForum.send_email_to')])
-        alist.push(['create distribution',I18n.t('xForum.create_distribution')])
-        alist.push(['add to distribution',I18n.t('xForum.add_to_distribution') ])
+        alist.push(['create list',I18n.t('xForum.create_user_list')])
+        alist.push(['edit list',I18n.t('xForum.edit_user_list') ])
         alist.push(['add topic monitor',I18n.t('xForum.Add_Topic_Monitor') ])
 
       end

data/app/models/xforum/people_list.rb

@@ -39,22 +39,33 @@ module Xforum
       end
       people
     end
-
+    def self.get_a_list(params,current_user)
+      case params[:list]
+        when 'forum-user-names'
+          PeopleList.get_forum_users(params, current_user)
+        when 'forum-user-emails'
+          PeopleList.get_forum_emails(params, current_user)
+        when 'forum-distribution-lists', 'forum-restricted-list' ,'forum-every-list'
+          PeopleList.get_forum_people_lists(params,current_user)
+        else
+      end
+    end
     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|
+        when 'create list'
+          PeopleList.find_or_create_by(name:params[:new_list_name], list:params[:list_type]){|list|
               list.people=user_ids.to_json
           }
-        when 'add to distribution'
-          alist= user_ids
-          blist=  JSON.load(PeopleList.where(id: params[:distribution_list]).pluck(:people)[0])
-          clist=(alist|blist)-(alist&blist)
-          PeopleList.where(id: params[:distribution_list]).update_all(people: clist.to_json)
+        when 'edit list'
+          PeopleList.where(id: params[:the_list]).update_all(people: user_ids.to_json)
         else
       end
     end
-
+    def self.get_forum_emails(params, user)
+      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:params[:list]}
+    end
     def self.get_people_list(params)
       which=PeopleList.get_which_owner(params)
       params.merge!(which)
@@ -84,11 +95,6 @@ module Xforum
       end
     end
 
-    def self.get_forum_emails(params, user)
-      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'}
-    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 =[]
@@ -96,10 +102,10 @@ module Xforum
       blist=alist.clone  #so you can do list.each and delete items
       blist.each { |record| alist.delete(record) if record[0].nil? || record[0]=='' }
       alist
-      {list_data: ForumAssist.named_array(alist, [:value, :item]), name: 'forum-user-tag'}
+      {list_data: ForumAssist.named_array(alist, [:value, :item]), name: params[:list]}
     end
 
-    def self.check_restrictions(blist,user, list_type)
+    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)
@@ -110,19 +116,32 @@ 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')[0].people).include?(user_id.to_s)
+          !JSON.load(PeopleList.where(topic_id:id,list:'invitation')[0].people).include?(user_id)
         when 'category', 'categories'
-          !JSON.load(PeopleList.where(category_id:id,list:'invitation')[0].people).include?(user_id.to_s)
+          !JSON.load(PeopleList.where(category_id:id,list:'invitation')[0].people).include?(user_id)
         when 'forum'
-          !JSON.load(PeopleList.where(forum_id:id,list:'invitation')[0].people).include?(user_id.to_s)
+          !JSON.load(PeopleList.where(forum_id:id,list:'invitation')[0].people).include?(user_id)
       end
     end
-    def self.get_forum_distribution_lists(params,user)
-      user.forum_admin? ? alist=PeopleList.where(list: 'distribution list').pluck(:name, :id) : alist=[]
-      alist.unshift([I18n.t('xForum.select_list'), 'select list', 0])
+    def self.get_forum_people_lists(params,user)
+      case params[:list]
+        when 'forum-distribution-lists'
+          alist=PeopleList.where(list:'distribution list').pluck(:name, :id)
+        when  'forum-restricted-list'
+            alist=PeopleList.where(list:'invitation').pluck(:name, :id)
+        when 'forum-every-list'
+            alist=PeopleList.where(private:false).pluck(:name, :id)
+        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]}
     end
 
+    def self.get_this_list(user,params)
+      if user.forum_admin?
+        {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=[]
@@ -137,7 +156,7 @@ module Xforum
       invitees=PeopleList.get_people_id_list(user.id, params[:invitees])
       peoplelist=PeopleList.where(list: 'invitation', owner_id: forum_id).first_or_create { |invitation|
         invitation.owner_id=forum_id
-        invitation.list='invitaton'
+        invitation.list='invitation'
       }
       peoplelist.invite_these_guys(invitees)
     end

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

@@ -10,19 +10,28 @@
       <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 id='forum-user-email-span'><%=select_tag(:forum_user_emails,options_for_select(@user_email), multiple:true, size:6, name:'forum-user-emails', class:'forum-select')%></span>
         <br>
         <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 id='forum-user-tag-span'><%=select_tag(:forum_users,options_for_select(@user_tags ), multiple:true, name:'forum-user-names',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>
-          <%=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 id="forum-every-list-span" style="display:none">
+          <label> <%= t('xForum.forum_List_Name')%>  </label>
+          <%=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')%></label> <input type="text" id='forum-new-list' class="admin-edit-field"  >
+            <br><label><%=t('xForum.type')%></label> <input type="text" id='forum-list-type' class="admin-edit-field"  >
+
+          </span>
+
           <label><%=t('xFrorum.User_Email')%></label>
-          <textarea id="forum_selected_emails" name="forum_selected_emails" readonly></textarea>            </span>
+          <textarea id="forum-selected-emails" name="forum-selected-emails" readonly></textarea>
+        </span>
+        <span id="forum-distribution-span" style="display:none">
+            <%=select_tag(:forum,options_for_select(@every_list),  id:'forum-distribution-lists', class:'forum-select')%>
+        </span>
         <span id="forum-moderator-add-span">
           <label> <%= t('xForum.Add_Topic_Monitor')%>  </label> <br>
           <%= select_tag(:forum, options_for_select(@categories),id:'forum-category-monitor', class: 'forum-select') %>

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

@@ -3,7 +3,7 @@
   <%@forum_actions=[] %>
   <%@user_tags=[]  %>
   <%@user_email=[]%>
-  <%@distribution_lists=[] %>
+  <%@every_list=[] %>
   <%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/app/views/xforum/forums/_forum_admin.html.erb

@@ -6,7 +6,7 @@
   <%@categories2.pop%>
   <%= select_tag(:forum, options_for_select(@categories2),id:'forum-category-admin', class: 'forum-select') %>
   <%= select_tag(:forum, options_for_select(@topics),id:'forum-admin-topic', class: 'forum-select') %>
-  <%=select_tag(:forum,options_for_select(@distribution_lists),  id:'forum-restricted-list', class:'forum-select')%>
+  <%=select_tag(:forum,options_for_select(@every_list),  id:'forum-restricted-list', class:'forum-select')%>
   <div class="forum-row senate-row">
     <%=render partial: 'xforum/admin_lists/admins_edit_lists'%>
     <%=render partial: 'xforum/admin_lists/admins_suggestions_lists'%>

data/db/migrate/20140826100001_add_private_to_people_lists.rb

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

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.374'
+  VERSION = '0.0.375'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.374
+  version: 0.0.375
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -252,6 +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
 - lib/active_record_extension.rb
 - lib/tasks/xforum_tasks.rake
 - lib/xforum.rb