Browse Source

Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop

tags/2019.01
Jonny Tischbein 2 years ago
parent
commit
b66bcb20da
4 changed files with 15 additions and 6 deletions
  1. +11
    -3
      include/items.php
  2. +2
    -2
      mod/item.php
  3. +1
    -0
      src/Object/Post.php
  4. +1
    -1
      view/theme/frio/templates/wall_thread.tpl

+ 11
- 3
include/items.php View File

@@ -345,7 +345,7 @@ function drop_items(array $items)
}
}

function drop_item($id)
function drop_item($id, $return)
{
$a = BaseObject::getApp();

@@ -409,8 +409,16 @@ function drop_item($id)
// delete the item
Item::deleteForUser(['id' => $item['id']], local_user());

$a->internalRedirect('network');
//NOTREACHED
$return_url = hex2bin($return);
notice("RETURN: " + $return_url);
if (empty($return_url) || strpos($return_url, 'display') ) {
$a->internalRedirect('network');
//NOTREACHED
}
else {
$a->internalRedirect($return_url);
//NOTREACHED
}
} else {
notice(L10n::t('Permission denied.') . EOL);
$a->internalRedirect('display/' . $item['guid']);


+ 2
- 2
mod/item.php View File

@@ -881,11 +881,11 @@ function item_content(App $a)

$o = '';

if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
if (($a->argc >= 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
if ($a->isAjax()) {
$o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
} else {
$o = drop_item($a->argv[2]);
$o = drop_item($a->argv[2], $a->argv[3]);
}

if ($a->isAjax()) {


+ 1
- 0
src/Object/Post.php View File

@@ -414,6 +414,7 @@ class Post extends BaseObject
'received' => $item['received'],
'commented' => $item['commented'],
'created_date' => $item['created'],
'return' => ($a->cmd) ? bin2hex($a->cmd) : '',
];

$arr = ['item' => $item, 'output' => $tmp_item];


+ 1
- 1
view/theme/frio/templates/wall_thread.tpl View File

@@ -141,7 +141,7 @@ as the value of $top_child_total (this is done at the end of this file)

{{if $item.drop.dropping}}
<li role="menuitem">
<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
</li>
{{/if}}
</ul>


Loading…
Cancel
Save