harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'extend-convitems-dropdown' into 'dev'

Browse Source 
Extend cog dropdown & temp fix for feed display of corrupt mids

See merge request hubzilla/core!1265
This commit is contained in:
Mario 2018-08-27 10:02:58 +02:00
commit 4c1944a08d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Lib/ThreadItem.php
View File

@ -325,6 +325,10 @@ class ThreadItem {
$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
$dropdown_extras_arr = [ 'item' => $item , 'dropdown_extras' => '' ];
call_hooks('dropdown_extras',$dropdown_extras_arr);
$dropdown_extras = $dropdown_extras_arr['dropdown_extras'];
$tmp_item = array( $tmp_item = array(
'template' => $this->get_template(), 'template' => $this->get_template(),
'mode' => $mode, 'mode' => $mode,
@ -404,6 +408,7 @@ class ThreadItem {
'addtocal' => (($has_event) ? t('Add to Calendar') : ''), 'addtocal' => (($has_event) ? t('Add to Calendar') : ''),
'drop' => $drop, 'drop' => $drop,
'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''), 'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
'dropdown_extras' => $dropdown_extras,
// end toolbar buttons // end toolbar buttons
'unseen_comments' => $unseen_comments, 'unseen_comments' => $unseen_comments,

4
Zotlabs/Module/Network.php
View File

@ -510,7 +510,7 @@ class Network extends \Zotlabs\Web\Controller {
if($load) { if($load) {
// Fetch a page full of parent items for this page // Fetch a page full of parent items for this page
$r = q("SELECT item.parent AS item_id FROM item $r = q("SELECT DISTINCT(item.parent) AS item_id FROM item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
$net_query $net_query
WHERE true $uids $item_thread_top $item_normal WHERE true $uids $item_thread_top $item_normal
@ -524,7 +524,7 @@ class Network extends \Zotlabs\Web\Controller {
else { else {
// this is an update // this is an update
$r = q("SELECT item.parent AS item_id FROM item $r = q("SELECT DISTINCT(item.parent) AS item_id FROM item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
$net_query $net_query
WHERE true $uids $item_normal_update $simple_update WHERE true $uids $item_normal_update $simple_update

4
view/tpl/conv_item.tpl
View File

@ -175,6 +175,10 @@
{{if $item.drop.dropping}} {{if $item.drop.dropping}}
<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a> <a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
{{/if}} {{/if}}
{{if $item.dropdown_extras}}
<div class="dropdown-divider"></div>
{{$item.dropdown_extras}}
{{/if}}
{{if $item.edpost && $item.dreport}} {{if $item.edpost && $item.dreport}}
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> <a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>