keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2148 from annando/issue-1871

Browse source 
Issue 1871: Show an information if a group is empty
This commit is contained in:
Tobias Diekershoff 2015-12-06 06:43:30 +01:00
commit 4680d10559
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mod/group.php
View file

@ -190,6 +190,7 @@ function group_content(&$a) {
'label_members' => t('Members'), 'label_members' => t('Members'),
'members' => array(), 'members' => array(),
'label_contacts' => t('All Contacts'), 'label_contacts' => t('All Contacts'),
'group_is_empty' => t('Group is empty'),
'contacts' => array(), 'contacts' => array(),
); );
@ -204,7 +205,7 @@ function group_content(&$a) {
group_rmv_member(local_user(),$group['name'],$member['id']); group_rmv_member(local_user(),$group['name'],$member['id']);
} }
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
intval(local_user()) intval(local_user())
); );

6
view/templates/groupeditor.tpl
View file

@ -2,7 +2,11 @@
<div id="group"> <div id="group">
<h3>{{$groupeditor.label_members}}</h3> <h3>{{$groupeditor.label_members}}</h3>
<div id="group-members" class="contact_list"> <div id="group-members" class="contact_list">
{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} {{if $groupeditor.members }}
{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
{{else}}
{{$groupeditor.group_is_empty}}
{{/if}}
</div> </div>
<div id="group-members-end"></div> <div id="group-members-end"></div>
<hr id="group-separator" /> <hr id="group-separator" />