bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Fix ignore notification

Browse source
This commit is contained in:
Philipp Holzer 2020-01-28 22:41:38 +01:00
parent 82f8794215
commit dd8d9d7c70
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
6 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Module/BaseNotifications.php
View file

@ -75,30 +75,6 @@ abstract class BaseNotifications extends BaseModule
self::$showAll = ($_REQUEST['show'] ?? '') === 'all';
}
public static function post(array $parameters = [])
{
$request_id = DI::args()->get(1);
if ($request_id === 'all') {
return;
}
if ($request_id) {
$intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
switch ($_POST['submit']) {
case DI::l10n()->t('Discard'):
$intro->discard();
break;
case DI::l10n()->t('Ignore'):
$intro->ignore();
break;
}
DI::baseUrl()->redirect('notifications/intros');
}
}
public static function rawContent(array $parameters = [])
{
// If the last argument of the query is NOT json, return

20
src/Module/Notifications/Notification.php
View file

@ -19,6 +19,26 @@ class Notification extends BaseModule
}
}
public static function post(array $parameters = [])
{
$request_id = $parameters['id'] ?? false;
if (DI::args()->get(1) == 'action' && $request_id) {
$intro = DI::intro()->selectFirst(['id' => $request_id, 'uid' => local_user()]);
switch ($_POST['submit']) {
case DI::l10n()->t('Discard'):
$intro->discard();
break;
case DI::l10n()->t('Ignore'):
$intro->ignore();
break;
}
DI::baseUrl()->redirect('notifications/intros');
}
}
public static function rawContent(array $parameters = [])
{
// @TODO: Replace with parameter from router

7
static/routes.config.php
View file

@ -184,9 +184,10 @@ return [
],
'/notification' => [
'[/]' => [Module\Notifications\Notification::class, [R::GET]],
'/view/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET]],
'/mark/all' => [Module\Notifications\Notification::class, [R::GET]],
'[/]' => [Module\Notifications\Notification::class, [R::GET]],
'/view/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET]],
'/mark/all' => [Module\Notifications\Notification::class, [R::GET]],
'/action/{id:\d+}' => [Module\Notifications\Notification::class, [ R::POST]],
],
'/objects/{guid}' => [Module\Objects::class, [R::GET]],

2
view/templates/notifications/intros.tpl
View file

@ -12,7 +12,7 @@
<div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div>
<div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
<form class="intro-form" action="notification/action/{{$intro_id}}" method="post">
<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}}
</form>

2
view/templates/notifications/suggestions.tpl
View file

@ -8,7 +8,7 @@
<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
<div class="intro-note" >{{$note}}</div>
<div class="intro-wrapper-end"></div>
<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
<form class="intro-form" action="notification/action/{{$intro_id}}" method="post">
<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
</form>

4
view/theme/frio/templates/notifications/intros.tpl
View file

@ -13,7 +13,7 @@
<div class="intro-actions pull-right nav-pills preferences">
<button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve}}" title="{{$approve}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
<form class="intro-form" action="notification/action/{{$intro_id}}" method="post">
<button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore}}" aria-label="{{$ignore}}" title="{{$ignore}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
{{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard}}" aria-label="{{$discard}}" title="{{$discard}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
</form>
@ -73,7 +73,7 @@
{{* On mobile touch devices we use buttons for approve, ingnore && discard to have a better UX *}}
{{if $APP->is_mobile}}
<div class="intro-action-buttons">
<form class="intro-form pull-left" action="notifications/{{$intro_id}}" method="post">
<form class="intro-form pull-left" action="notification/action/{{$intro_id}}" method="post">
<button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}">{{$ignore}}</button>
{{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard}}">{{$discard}}</button>&nbsp;{{/if}}
</form>