xforum 0.0.372 → 0.0.373

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d76a2c0955075babe121fdcbc5c4b10a0776a46
-  data.tar.gz: 0ad69779618221c41f6253d82376dac01e1a1dd6
+  metadata.gz: d41a0792d86f523f5cd6e101d5a122968c528a1e
+  data.tar.gz: 0e7084ef6a0a2678fef31d1daee19251df18e069
 SHA512:
-  metadata.gz: b330908427c98178c107d67e3909a4ae233c9f64e52fbe501bb8f90f237e78a2de35e35342626447fa40a170c32b41961ddc0ab0df203157e3f7afb09279b896
-  data.tar.gz: 69ca03ac90092844a24151d8470e7f3ed8cc9f39c3b929740720464c81ba5644196e752dc375ddb71ad842e0e9177f9a1096ea005f53eb5dc790dc9b38849b0c
+  metadata.gz: 2303f14698428456128f29dd44f9b258df5aa249f37479db61a5957a78697e3647499b45031ca95dcec88622c281fc467ed7c5e831dcfece7fbeec8b98cc1570
+  data.tar.gz: e91455ca524b2af719a0ff75e2d82441b9ce734ef2cd5ad24e1c48aa76c595cb475054b9ea9d0f46a8a53c5c2e479db6af606810f1a3b7c5bf1c6d411da10f6c

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

@@ -22,6 +22,8 @@ jQuery ->
     event.stopPropagation()
   $('#forum-senate-admin-users').delegate '[id = forum-admin-list-option]','click', (evt) ->
     setSelections(event.target)
+  $('#forum-senate-admin-lists').delegate '[id = set-moderation]','click', (evt) ->
+    changeModeration(event.target)
   $('#forum-category-admin').change ->
     getAdminsTopic()
   $('#forum-actions').change ->
@@ -145,6 +147,7 @@ window.doAdminStuff = ->
 
 
 setAdminDisplay=->
+  hideModerating()
   hideMe({id: 'review-forum-span'})
   hideMe({id: 'forum-senate'})
   showMe({id: 'forum-senate-admin'})
@@ -361,7 +364,7 @@ addCancel=(params)->
   $("[id = forum-add-admin-user]").val('me')
 
 openEditObject = (which_one)->
-  id=which_one.dataset.id
+  id=which_one.dataset.admin_list_id
   parent = which_one.parentNode
   line=parent.children[CHILD_EDIT_ENTRY].children[0]
   if which_one.dataset.state == 'edit'
@@ -371,6 +374,7 @@ openEditObject = (which_one)->
     line.value = parent.children[CHILD_EDIT_ITEM].innerHTML
     hideMe({obj:parent.children[CHILD_EDIT_ITEM]})
     line.focus()
+    addModerate(which_one)
   else if which_one.dataset.state == 'save'
     which_one.dataset.state = 'edit'
     newline = line.value
@@ -380,7 +384,42 @@ openEditObject = (which_one)->
     unless newline == ''
       translating=which_one.parentNode.parentElement.dataset.translating
       parent.children[CHILD_EDIT_ITEM].innerHTML = newline
-      $.post('xforum/forum_ajax',{function:'edit forum object',id:id,newline:newline,which_list:which_one.parentNode.parentElement.id, translating:translating})
+      request={function:'edit forum object',id:id,newline:newline,which_list:which_one.parentNode.parentElement.id, translating:translating}
+      request.moderate_me= which_one.dataset.moderated
+      hideModerating()
+      $.post('xforum/forum_ajax',request)
+
+changeModeration=(target)->
+  id=target.dataset.target
+  b_target= $('[data-admin_list_id='+id+']')
+  for i in [0...b_target.length]
+    if b_target[i].id='edit-forum-object'
+      b_target[i].dataset.moderated=b_target[i].dataset.moderated=='false'
+
+
+hideModerating=->
+  hideMe({name:'moderate-category'})
+  hideMe({name:'moderate-topic'})
+  hideMe({name:'un-moderate-category'})
+  hideMe({name:'un-moderate-topic'})
+
+
+addModerate=(which_one)->
+  if which_one.dataset.moderated=='true'
+    if which_one.dataset.parent=='category-list'
+      showMe({name:'un-moderate-category'})
+      $('[name=un-moderate-category]')[0].dataset.target=which_one.dataset.admin_list_id
+    else
+      showMe({name:'un-moderate-topic'})
+      $('[name=un-moderate-topic]')[0].dataset.target=which_one.dataset.admin_list_id
+  else
+    if which_one.dataset.parent=='category-list'
+      showMe({name:'moderate-category'})
+      $('[name=moderate-category]')[0].dataset.target=which_one.dataset.admin_list_id
+    else
+      showMe({name:'moderate-topic'})
+      $('[name=moderate-topic]')[0].dataset.target=which_one.dataset.admin_list_id
+
 
 getAdminCategories = ->
   $.post('xforum/forum_ajax',{function:'get categories',category:select,language:getLanguage(),list,'category',hold_test:false,restriced:false},loadAdminsList)
@@ -425,16 +464,17 @@ addListEntry = (which,vars)->
   i = document.getElementById(which).children.length
   ref = document.getElementById(which).children[i-1]
   tag = which.split('-')[1]
-  entry.children[CHILD_DEL].dataset.id = vars.id
+  entry.children[CHILD_DEL].dataset.admin_list_id = vars.id
   entry.children[CHILD_DEL].dataset.target = 'list-item-'+tag+'-'+i
   if vars.inert
     $(entry.children[CHILD_DEL]).val('----')
   else
     entry.children[CHILD_DEL].id = 'delete-forum-object'
     entry.children[CHILD_DEL].value= entry.children[CHILD_DEL].dataset.del
-  entry.children[CHILD_EDIT].dataset.id = vars.id
+  entry.children[CHILD_EDIT].dataset.admin_list_id = vars.id
   entry.children[CHILD_EDIT].dataset.target = 'list-item-'+tag+'-'+i
   entry.children[CHILD_EDIT].dataset.state = 'edit'
+  entry.children[CHILD_EDIT].dataset.moderated = vars.is_moderated
   entry.children[CHILD_EDIT_ITEM].innerHTML = vars.item
   entry.children[CHILD_EDIT_ITEM].id = 'list-item-'+tag+'-'+i
   entry.children[CHILD_EDIT_ENTRY].children[0].id="edit-entry-#{vars.id}"

data/app/models/xforum/category.rb

@@ -43,7 +43,7 @@ module Xforum
     end
 
     def self.edit_category(params,user)
-        Category.where(id: params[:id]).update_all(name:params[:newline]) if user.forum_admin?
+      Category.where(id: params[:id]).update_all(name: params[:newline], is_moderated: params[:moderate_me]=='true') if user.forum_admin?
     end
     def self.suggestion(params,user)  #add new category or topic
       Category.create(suggestion:true,name:params[:suggestion],user_id:user.id)
@@ -63,8 +63,8 @@ module Xforum
       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],{})
+          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],{})
       category_list=ForumAssist.make_last(category_list.clone, {key: :id,ref:Category.where(name:'request new category').pluck(:id)[0]})
       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') unless user.forum_admin?

data/app/models/xforum/forum.rb

@@ -75,15 +75,16 @@ module Xforum
             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|
-              test=PeopleList.check_people_list({topic:record[:id], user_id:user.id,list:'invitation'}) if (record[:restricted] && !record[:owner])
+              test=!PeopleList.check_people_list({topic:record[:id], user_id:user.id,list:'invitation'}) if (record[:restricted] && !record[:owner])
               if test.nil?
                 case record[:state]
-                  when 'reject' then  test= false
-                  when 'new' then  test= !(ENV['XFORUM_NEW_RULE']=='no')
-                  else  test=true
+                  when 'reject' then  test= true
+                  when 'new'
+                    ENV['XFORUM_NEW_RULE']=='no' || Topic.where(id:topic_id).is_moderated
+                  else  test=false
                 end
               end
-              !test
+              test
             }
             the_list=new_list
           end

data/app/models/xforum/topic.rb

@@ -23,8 +23,8 @@ 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],{swap:{name: :item}})  :
-            topics=Topic.grab({category_id:category_id}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})
+            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=[] if topics[0][:id].nil?
         topics=PeopleList.check_restrictions(topics,user,'topic') unless user.forum_admin?
         a=Topic.grab({name:'select topic'},[:id,:name,:state,:restricted,:closed],{swap:{name: :item}})[0]
@@ -139,7 +139,7 @@ module Xforum
     end
 
     def self.edit_topic(params,user)
-      Topic.where(id: params[:id]).update_all(name:params[:newline]) if user.forum_admin?
+      Topic.where(id: params[:id]).update_all(name: params[:newline], is_moderated: params[:moderate_me]=='true') if user.forum_admin?
     end
 
     def self.remove_object(params,user)

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

@@ -44,6 +44,9 @@
              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'
              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')%>">
+
       <input class='red-ellipse comment-btn' type="button" id="restrict-category" data-submit= "<%=t('xForum.Submit')%>" data-restrict="<%=t('xForum.Restrict')%>"  value="<%=t('xForum.Restrict')%>">
       <input class='red-ellipse comment-btn'  type='button' id=forum-admin-button name= 'forum-add-cancel'
              data-who='category' value= "<%= t('xForum.Cancel')%>" >
@@ -55,6 +58,8 @@
       <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')%>" >
       <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')%>">
       <input class='red-ellipse comment-btn'  type='button' id= 'forum-admin-button' name='forum-add-cancel'
              data-who='topic' value= "<%= t('xForum.Cancel')%>" >
   </span>

data/config/locales/forum.de.yml

@@ -91,4 +91,6 @@ de:
     select_category:                     Kategorie auswählen
     Replay:                              Wiederholung
     Back:                                Zurück
-    Action: "Forum Action"
+    Action:                              Forum Action
+    stop_moderating:                     mäßig
+    moderate:                            stoppen mäßig

data/config/locales/forum.en.yml

@@ -93,4 +93,6 @@ en:
     Replay:                               Replay
     Back:                                 Back
     Action:                               Action
-    New:                                  New
+    New:                                  New
+    stop_moderating:                      stop moderating
+    moderate:                             moderate

data/config/locales/forum.es.yml

@@ -91,4 +91,6 @@ es:
     select_topic:                     seleccione tema
     select_category:                  Elije categoría
     Replay:                           Repetición
-    Back:                             Atrás
+    Back:                             Atrás
+    stop_moderating:                  moderada
+    moderate:                         dejar de moderar

data/config/locales/forum.fr.yml

@@ -91,4 +91,6 @@ fr:
     select_topic:                     sélectionnez le sujet
     select_category:                  de choisir une catégorie
     Replay:                           Rejouer
-    Back:                             Arrière
+    Back:                             Arrière
+    stop_moderating:                  modéré
+    moderate:                         arrêter modérateur

data/db/migrate/20140813300_add_is_moderated_to_category_topics.rb

@@ -0,0 +1,6 @@
+class AddHasVideoToPhoto < ActiveRecord::Migration
+  def change
+    add_column :xforum_topics,      :is_moderated,  :boolean, default:false
+    add_column :xforum_categories,  :is_moderated,  :boolean, default:false
+  end
+end

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.372'
+  VERSION = '0.0.373'
 end

metadata

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