xforum 0.0.383 → 0.0.384
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/xforum/forum_basic.js.coffee +24 -18
- data/app/models/xforum/category.rb +1 -1
- data/app/models/xforum/forum.rb +1 -1
- data/app/models/xforum/topic.rb +2 -3
- data/app/models/xforum/translation.rb +4 -4
- data/app/views/xforum/admin_lists/_admins_edit_lists.html.erb +2 -2
- data/lib/xforum/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 72bb988ee8ecea8bf27b7f82f3e72d022a3d7eea
|
4
|
+
data.tar.gz: 6a8165641c71d03da8650d0025781c1ea13c0674
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4bd5e837bb9f48deb8f5bf062f4624a69f1d25511c0362feb6d16d5d7dbc081c983586fdf50153a03a719aade237b279e465e9c7bee180e1359b4211698e6ead
|
7
|
+
data.tar.gz: ed2fc7d7bb9bbe0bb7a90d314f1c15bb0fe5b6d658d2fb428974edc81f5038bbbd1dbce69f7f15ff691a00b9a1016e2bedd177b7f28f1d45ebaad6daede5a3e0
|
@@ -18,7 +18,7 @@ jQuery ->
|
|
18
18
|
$('#forum-language').change ->
|
19
19
|
getSenate()
|
20
20
|
$('#forum-category').change ->
|
21
|
-
changeTopic()
|
21
|
+
changeTopic(this)
|
22
22
|
$('#forum-video-replay').click ->
|
23
23
|
img=document.getElementById('big-forum-picture')
|
24
24
|
img.src=img.src
|
@@ -164,12 +164,13 @@ window.pushOption = (q_selector,data,offset)->
|
|
164
164
|
switch selector.tagName
|
165
165
|
when 'UL'
|
166
166
|
option= document.createElement('li')
|
167
|
-
option.innerHTML=data.
|
167
|
+
option.innerHTML=data.item
|
168
168
|
when 'SELECT'
|
169
169
|
option = document.createElement("option")
|
170
|
-
option.text = data.
|
170
|
+
option.text = data.item
|
171
171
|
else
|
172
|
-
option.
|
172
|
+
option.dataset.action=data.action
|
173
|
+
option.value = data.id
|
173
174
|
option.id = 'forum-admin-list-option'
|
174
175
|
ref = selector.children[selector.children.length - offset]
|
175
176
|
if ref==undefined
|
@@ -370,19 +371,24 @@ addNewThing = (select)->
|
|
370
371
|
hideMe({id: 'forum-senate'})
|
371
372
|
$('#forum-add-new-thing-span').data.thing = select
|
372
373
|
|
373
|
-
window.changeTopic
|
374
|
+
window.changeTopic=(which) ->
|
374
375
|
setTopic(0)
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
376
|
+
if which?
|
377
|
+
them=which.children
|
378
|
+
select='select category'
|
379
|
+
for option in them
|
380
|
+
if option.value==which.value
|
381
|
+
select=option.dataset.action
|
382
|
+
hideMe({id: 'forum-senate-admin-lists'})
|
383
|
+
hideMe({id:'forum-senate-admin-users'})
|
384
|
+
clearSenate()
|
385
|
+
if select == 'request new category'
|
386
|
+
addNewThing('forum-category')
|
387
|
+
else if select == 'admin'
|
388
|
+
doAdminStuff()
|
389
|
+
else if select != 'select category'
|
390
|
+
blockMe({id: 'forum-senate'})
|
391
|
+
hideMe({id: 'forum-senate-admin'})
|
392
|
+
document.getElementById('forum-senate').dataset.category = select
|
393
|
+
$.post('xforum/forum_ajax', {function: 'get topics',list:'forum-topic', category: which.value, hold_test: true, restricted: true}, loadList)
|
388
394
|
|
@@ -75,7 +75,7 @@ module Xforum
|
|
75
75
|
category_list=ForumAssist.make_first(category_list.clone,{key: :id,ref:Category.where(name:'select category').pluck(:id)[0]})
|
76
76
|
category_list=PeopleList.check_restrictions(category_list.clone,user,'categories')
|
77
77
|
category_list=Translation.translate_list(category_list.clone,params[:language],'category')
|
78
|
-
category_list.push({id:0,
|
78
|
+
category_list.push({id:0, value:0, action:'admin',item:I18n.t('xForum.Admin_name')}) if user.forum_admin?
|
79
79
|
{list_data:category_list,id:params[:list]}
|
80
80
|
end
|
81
81
|
def self.get_category_id(params)
|
data/app/models/xforum/forum.rb
CHANGED
@@ -45,7 +45,7 @@ module Xforum
|
|
45
45
|
if params[:topic]== 'select topic'
|
46
46
|
return
|
47
47
|
end
|
48
|
-
topic=Topic.find_by(
|
48
|
+
topic=Topic.find_by(id:params[:topic])
|
49
49
|
category=Category.find_by(id:topic.category_id)
|
50
50
|
if (category.private || !user.forum_admin?) && PeopleList.check_invitation(category.name,category.id, user.id, 'category')
|
51
51
|
{to_do:'nothing'}
|
data/app/models/xforum/topic.rb
CHANGED
@@ -21,10 +21,9 @@ module Xforum
|
|
21
21
|
Topic.create(name:'select topic') if Topic.find_by(name:'select topic').nil?
|
22
22
|
Topic.create(name:'request new topic') if Topic.find_by(name:'request new topic').nil?
|
23
23
|
unless params[:category] == 'select category'
|
24
|
-
category_id=Category.where(name:params[:category]).pluck(:id)[0]
|
25
24
|
params[:hold_test]=='true' ?
|
26
|
-
topics=Topic.grab({category_id:
|
27
|
-
topics=Topic.grab({category_id:
|
25
|
+
topics=Topic.grab({category_id:params[:category],closed:false,suggestion:false}, [:id,:name,:state,:category_id,:restricted,:closed,:is_moderated],{swap:{name: :item}}) :
|
26
|
+
topics=Topic.grab({category_id:params[:category]}, [:id,:name,:state,:category_id,:restricted,:closed,:is_moderated],{swap:{name: :item}})
|
28
27
|
topics=[] if topics[0][:id].nil?
|
29
28
|
topics=PeopleList.check_restrictions(topics,user,'topic')
|
30
29
|
a=Topic.grab({name:'select topic'},[:id,:name,:state,:category_id,:restricted,:closed],{swap:{name: :item}})[0]
|
@@ -90,16 +90,16 @@ module Xforum
|
|
90
90
|
case list_name
|
91
91
|
when 'category' , 'categories'
|
92
92
|
entry.store(:item,Category.where(id:entry[:id]).pluck(:name)[0] )
|
93
|
-
entry.store(:
|
93
|
+
entry.store(:action,entry[:item])
|
94
94
|
when 'topic'
|
95
95
|
entry.store(:item,Topic.where(id:entry[:id]).pluck(:name)[0] )
|
96
|
-
entry.store(:
|
96
|
+
entry.store(:action,entry[:item])
|
97
97
|
when 'language'
|
98
98
|
translation ={content:entry[:value].concat(' - ').concat(entry[:local_name])}
|
99
|
-
entry.store(:
|
99
|
+
entry.store(:action,'wait')
|
100
100
|
else
|
101
101
|
end
|
102
|
-
entry[:
|
102
|
+
entry[:item]=translation[:content] unless translation.nil?
|
103
103
|
}
|
104
104
|
alist
|
105
105
|
end
|
@@ -42,7 +42,7 @@
|
|
42
42
|
<span id="forum-add-category-input-span" hidden><input id='forum-add-admin-category' type="text" class="admin-edit-field" ></span> <br>
|
43
43
|
<input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-add-category'
|
44
44
|
data-state='add' data-add= "<%= t('xForum.Add_Category')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Category')%>" >
|
45
|
-
<input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-category'
|
45
|
+
<input class='blue-ellipse comment-btn' hidden type='button' id=forum-admin-button name= 'forum-translate-category'
|
46
46
|
data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
|
47
47
|
<input class='red-ellipse comment-btn' name='moderate-category' type="button" id="set-moderation" value="<%=t('xForum.moderate')%>">
|
48
48
|
<input class='red-ellipse comment-btn' name='un-moderate-category' type="button" id="set-moderation" value="<%=t('xForum.stop_moderating')%>">
|
@@ -56,7 +56,7 @@
|
|
56
56
|
<input class='blue-ellipse comment-btn' type='button' id= 'forum-admin-button' name='forum-add-topic'
|
57
57
|
data-state='add' data-add= "<%= t('xForum.Add_Topic')%>" data-save= "<%= t('xForum.save')%>" value= "<%= t('xForum.Add_Topic')%>" >
|
58
58
|
<input class='blue-ellipse comment-btn' type='button' id=forum-admin-button name= 'forum-translate-topic'
|
59
|
-
data-state='translate'
|
59
|
+
data-state='translate' data-translate= "<%= t('xForum.Translate')%>" data-done= "<%= t('xForum.Done')%>" value= "<%= t('xForum.Translate')%>" >
|
60
60
|
<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')%>">
|
61
61
|
<input class='red-ellipse comment-btn' name='moderate-topic' type="button" id="set-moderation" value="<%=t('xForum.moderate')%>">
|
62
62
|
<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
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: xforum
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.384
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert D Blanton
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-10-
|
11
|
+
date: 2014-10-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sqlite3
|