Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 02:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consensus items not working correctly and make the collections widget abide by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.

Browse source
This commit is contained in:
redmatrix 2015-05-18 21:32:55 -07:00
parent b7ae85e89a
commit e521da05da
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/ItemObject.php
View file

@ -152,7 +152,7 @@ class Item extends BaseObject {
}
}
$consensus = (($item['item_flags'] & ITEM_CONSENSUS) ? true : false);
$consensus = (intval($item['item_consensus']) ? true : false);
if($consensus) {
$response_verbs[] = 'agree';
$response_verbs[] = 'disagree';
@ -373,12 +373,16 @@ class Item extends BaseObject {
$result['children'] = array();
$nb_children = count($children);
$visible_comments = get_config('system','expanded_comments');
if($visible_comments === false)
$visible_comments = 3;
if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
foreach($children as $child) {
$result['children'][] = $child->get_template_data($conv_responses, $thread_level + 1);
}
// Collapse
if(($nb_children > 2) || ($thread_level > 1)) {
if(($nb_children > $visible_comments) || ($thread_level > 1)) {
$result['children'][0]['comment_firstcollapsed'] = true;
$result['children'][0]['num_comments'] = $comment_count_txt;
$result['children'][0]['hide_text'] = t('[+] show all');
@ -386,7 +390,7 @@ class Item extends BaseObject {
$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
}
else {
$result['children'][$nb_children - 3]['comment_lastcollapsed'] = true;
$result['children'][$nb_children - ($visible_comments + 1)]['comment_lastcollapsed'] = true;
}
}
}

2
include/group.php
View file

@ -244,7 +244,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
$o = '';
if(! local_channel())
if(! (local_channel() && feature_enabled(local_channel(),'groups')))
return '';
$groups = array();