hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1189 notifications display is broken

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-05-30 18:58:05 +02:00
parent e4516c39cb
commit 53cafa7117
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/User/Notifications.php
View File

@@ -103,9 +103,9 @@ class Notifications implements ControllerProviderInterface
$app->abort(400); $app->abort(400);
} }
$page = (int) $request->query->get('page', 1); $page = (int) $request->query->get('page', 0);
return $app->json($app['events-manager']->get_json_notifications(($page < 1 ? 1 : $page))); return $app->json($app['events-manager']->get_notifications_as_array(($page < 0 ? 0 : $page)));
} }
/** /**

4
lib/classes/eventsmanager/broker.php
View File

@@ -111,7 +111,7 @@ class eventsmanager_broker
return true; return true;
} }
public function get_json_notifications($page = 0) public function get_notifications_as_array($page = 0)
{ {
$unread = 0; $unread = 0;
$total = 0; $total = 0;
@@ -178,7 +178,7 @@ class eventsmanager_broker
$data['next'] = '<a href="#" onclick="print_notifications(' . ((int) $page + 1) . ');return false;">' . _('charger d\'avantages de notifications') . '</a>'; $data['next'] = '<a href="#" onclick="print_notifications(' . ((int) $page + 1) . ');return false;">' . _('charger d\'avantages de notifications') . '</a>';
} }
return p4string::jsonencode($data); return $data;
} }
public function get_unread_notifications_number() public function get_unread_notifications_number()

13
templates/web/common/menubar.html.twig
View File

@@ -135,11 +135,6 @@
</span> </span>
</a> </a>
</li> </li>
<div style="display:none;z-index:30000;" id="notification_box">
{% set notifications = app['events-manager'].get_notifications %}
{% include 'prod/notifications.html.twig' %}
</div>
{% endif %} {% endif %}
<li> <li>
{% if app['authentication'].isAuthenticated() %} {% if app['authentication'].isAuthenticated() %}
@@ -194,8 +189,12 @@
{% endif %} {% endif %}
</li> </li>
</ol> </ol>
</div> </div>
</div> </div>
{% if app['authentication'].isAuthenticated() and (module == "client" or module == "prod") %}
<div style="display:none;z-index:30000;" id="notification_box">
{% set notifications = app['events-manager'].get_notifications %}
{% include 'prod/notifications.html.twig' %}
</div>
{% endif %}

4
www/include/jquery.common.js
View File

@@ -129,7 +129,7 @@ function set_notif_position()
if(trigger.length === 0) if(trigger.length === 0)
return; return;
$('#notification_box').css({ $('#notification_box').css({
'left':Math.round(trigger.offset().left) 'left':Math.round(trigger.offset().left - 1)
}); });
} }
$(window).bind('resize', function(){ $(window).bind('resize', function(){
@@ -173,7 +173,7 @@ function print_notifications(page)
$.ajax({ $.ajax({
type: "POST", type: "GET",
url: "/user/notifications/", url: "/user/notifications/",
dataType : 'json', dataType : 'json',
data: { data: {