xforum 0.0.383 → 0.0.384

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c331811380bf175a0180993339aa7d0337a0c525
-  data.tar.gz: 257d15c5d9d18b14bafbb174fc5b847f910c57c4
+  metadata.gz: 72bb988ee8ecea8bf27b7f82f3e72d022a3d7eea
+  data.tar.gz: 6a8165641c71d03da8650d0025781c1ea13c0674
 SHA512:
-  metadata.gz: 589eda227511bc74a7d0d6b940ab502055f9a621963b3d57380f3ee6c507466422217f4206982324f6d9f067895e54d110d180784cece460b87641b9aaef25ef
-  data.tar.gz: 6053414004b85780e05a30d8713450036bf22e22e64efb8d01e5896c6a9c320ac450dd19a581e4f003c5b7458bb8362ada7dd8f696216fe82cd2d83065db3ca4
+  metadata.gz: 4bd5e837bb9f48deb8f5bf062f4624a69f1d25511c0362feb6d16d5d7dbc081c983586fdf50153a03a719aade237b279e465e9c7bee180e1359b4211698e6ead
+  data.tar.gz: ed2fc7d7bb9bbe0bb7a90d314f1c15bb0fe5b6d658d2fb428974edc81f5038bbbd1dbce69f7f15ff691a00b9a1016e2bedd177b7f28f1d45ebaad6daede5a3e0

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

@@ -18,7 +18,7 @@ jQuery ->
   $('#forum-language').change ->
     getSenate()
   $('#forum-category').change ->
-    changeTopic()
+    changeTopic(this)
   $('#forum-video-replay').click ->
     img=document.getElementById('big-forum-picture')
     img.src=img.src
@@ -164,12 +164,13 @@ window.pushOption = (q_selector,data,offset)->
     switch selector.tagName
       when 'UL'
         option= document.createElement('li')
-        option.innerHTML=data.value
+        option.innerHTML=data.item
       when 'SELECT'
         option = document.createElement("option")
-        option.text = data.value
+        option.text = data.item
       else
-    option.value = data.item
+    option.dataset.action=data.action
+    option.value = data.id
     option.id =  'forum-admin-list-option'
     ref = selector.children[selector.children.length - offset]
     if ref==undefined
@@ -370,19 +371,24 @@ addNewThing = (select)->
   hideMe({id: 'forum-senate'})
   $('#forum-add-new-thing-span').data.thing = select
 
-window.changeTopic = ->
+window.changeTopic=(which) ->
   setTopic(0)
-  select = document.getElementById('forum-category').value
-  hideMe({id: 'forum-senate-admin-lists'})
-  hideMe({id:'forum-senate-admin-users'})
-  clearSenate()
-  if select == 'request new category'
-    addNewThing('forum-category')
-  else if select == 'admin'
-    doAdminStuff()
-  else if select != 'select category'
-    blockMe({id: 'forum-senate'})
-    hideMe({id: 'forum-senate-admin'})
-    document.getElementById('forum-senate').dataset.category = select
-    $.post('xforum/forum_ajax', {function: 'get topics',list:'forum-topic', category: select, hold_test: true, restricted: true}, loadList)
+  if which?
+    them=which.children
+    select='select category'
+    for  option in them
+      if option.value==which.value
+        select=option.dataset.action
+    hideMe({id: 'forum-senate-admin-lists'})
+    hideMe({id:'forum-senate-admin-users'})
+    clearSenate()
+    if select == 'request new category'
+      addNewThing('forum-category')
+    else if select == 'admin'
+      doAdminStuff()
+    else if select != 'select category'
+      blockMe({id: 'forum-senate'})
+      hideMe({id: 'forum-senate-admin'})
+      document.getElementById('forum-senate').dataset.category = select
+      $.post('xforum/forum_ajax', {function: 'get topics',list:'forum-topic', category: which.value, hold_test: true, restricted: true}, loadList)
 

data/app/models/xforum/category.rb

@@ -75,7 +75,7 @@ module Xforum
       category_list=ForumAssist.make_first(category_list.clone,{key: :id,ref:Category.where(name:'select category').pluck(:id)[0]})
       category_list=PeopleList.check_restrictions(category_list.clone,user,'categories')
       category_list=Translation.translate_list(category_list.clone,params[:language],'category')
-      category_list.push({id:0, item:'admin',value: I18n.t('xForum.Admin_name')}) if user.forum_admin?
+      category_list.push({id:0, value:0, action:'admin',item:I18n.t('xForum.Admin_name')}) if user.forum_admin?
       {list_data:category_list,id:params[:list]}
     end
     def self.get_category_id(params)

data/app/models/xforum/forum.rb

@@ -45,7 +45,7 @@ module Xforum
       if params[:topic]== 'select topic'
         return
       end
-      topic=Topic.find_by(name:params[:topic])
+      topic=Topic.find_by(id: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'}

data/app/models/xforum/topic.rb

@@ -21,10 +21,9 @@ module Xforum
       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' ?
-            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=Topic.grab({category_id:params[:category],closed:false,suggestion:false},  [:id,:name,:state,:category_id,:restricted,:closed,:is_moderated],{swap:{name: :item}})  :
+            topics=Topic.grab({category_id:params[:category]}, [: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,:category_id,:restricted,:closed],{swap:{name: :item}})[0]

data/app/models/xforum/translation.rb

@@ -90,16 +90,16 @@ module Xforum
         case list_name
           when 'category' , 'categories'
             entry.store(:item,Category.where(id:entry[:id]).pluck(:name)[0] )
-            entry.store(:value,entry[:item])
+            entry.store(:action,entry[:item])
           when 'topic'
             entry.store(:item,Topic.where(id:entry[:id]).pluck(:name)[0] )
-            entry.store(:value,entry[:item])
+            entry.store(:action,entry[:item])
           when 'language'
             translation ={content:entry[:value].concat(' - ').concat(entry[:local_name])}
-            entry.store(:value,'wait')
+            entry.store(:action,'wait')
           else
         end
-        entry[:value]=translation[:content] unless translation.nil?
+        entry[:item]=translation[:content] unless translation.nil?
       }
       alist
     end

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

@@ -42,7 +42,7 @@
       <span id="forum-add-category-input-span" hidden><input id='forum-add-admin-category' type="text" class="admin-edit-field" ></span> <br>
       <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-add-category'
              data-state='add' data-add= "<%= t('xForum.Add_Category')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Category')%>" >
-      <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-category'
+      <input class='blue-ellipse comment-btn' hidden type='button' id=forum-admin-button name= 'forum-translate-category'
              data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
       <input class='red-ellipse comment-btn' name='moderate-category' type="button" id="set-moderation"  value="<%=t('xForum.moderate')%>">
       <input class='red-ellipse comment-btn' name='un-moderate-category' type="button" id="set-moderation"  value="<%=t('xForum.stop_moderating')%>">
@@ -56,7 +56,7 @@
       <input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name='forum-add-topic'
              data-state='add' data-add= "<%= t('xForum.Add_Topic')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Topic')%>" >
       <input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-topic'
-             data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
+             data-state='translate'  data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
       <input class='red-ellipse comment-btn' type="button" id="restrict-topic" data-submit= "<%=t('xForum.Submit')%>" data-restrict="<%=t('xForum.Restrict')%>"  value="<%=t('xForum.Restrict')%>">
            <input class='red-ellipse comment-btn' name='moderate-topic' type="button" id="set-moderation"  value="<%=t('xForum.moderate')%>">
       <input class='red-ellipse comment-btn' name='un-moderate-topic' type="button" id="set-moderation"  value="<%=t('xForum.stop_moderating')%>">

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.383'
+  VERSION = '0.0.384'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.383
+  version: 0.0.384
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3