[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15391] booking: display messages in frontend
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15391] booking: display messages in frontend |
Date: |
Thu, 28 Jul 2016 08:44:55 +0000 (UTC) |
Revision: 15391
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15391
Author: sigurdne
Date: 2016-07-28 08:44:55 +0000 (Thu, 28 Jul 2016)
Log Message:
-----------
booking: display messages in frontend
Modified Paths:
--------------
trunk/booking/inc/class.socommon.inc.php
trunk/booking/inc/class.uiapplication.inc.php
trunk/phpgwapi/templates/bkbooking/navbar.inc.php
Modified: trunk/booking/inc/class.socommon.inc.php
===================================================================
--- trunk/booking/inc/class.socommon.inc.php 2016-07-28 00:39:25 UTC (rev
15390)
+++ trunk/booking/inc/class.socommon.inc.php 2016-07-28 08:44:55 UTC (rev
15391)
@@ -293,7 +293,7 @@
{
if (!$id)
{
- return null;
+ return array();
}
$row = array();
$pk_params = $this->primary_key_conditions($id);
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2016-07-28 00:39:25 UTC
(rev 15390)
+++ trunk/booking/inc/class.uiapplication.inc.php 2016-07-28 08:44:55 UTC
(rev 15391)
@@ -665,7 +665,7 @@
}
catch
(booking_unauthorized_exception $e)
{
-
phpgwapi_cache::message_set(lang('Could not add object due to insufficient
permissions'));
+
phpgwapi_cache::message_set(lang('Could not add object due to insufficient
permissions'),'error');
}
}
@@ -1082,7 +1082,7 @@
if ($old_file['name']
== $files['name']['name'])
{
$file_exist =
true;
-
phpgwapi_cache::message_set(lang('file exists'));
+
phpgwapi_cache::message_set(lang('file exists'),'error');
break;
}
}
@@ -1104,7 +1104,7 @@
}
catch
(booking_unauthorized_exception $e)
{
-
phpgwapi_cache::message_set(lang('Could not add object due to insufficient
permissions'));
+
phpgwapi_cache::message_set(lang('Could not add object due to insufficient
permissions'),'error');
}
}
Modified: trunk/phpgwapi/templates/bkbooking/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/navbar.inc.php 2016-07-28 00:39:25 UTC
(rev 15390)
+++ trunk/phpgwapi/templates/bkbooking/navbar.inc.php 2016-07-28 08:44:55 UTC
(rev 15391)
@@ -65,6 +65,19 @@
$GLOBALS['phpgw']->template->set_var($var);
$GLOBALS['phpgw']->template->pfp('out','navbar');
+ if( phpgw::get_var('phpgw_return_as') != 'json' && $receipt =
phpgwapi_cache::session_get('phpgwapi', 'phpgw_messages'))
+ {
+ phpgwapi_cache::session_clear('phpgwapi',
'phpgw_messages');
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+ foreach($msgbox_data as & $message)
+ {
+ echo "<div class='{$message['msgbox_class']}'>";
+ echo $message['msgbox_text'];
+ echo '</div>';
+ }
+ }
+
register_shutdown_function('parse_footer_end');
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15391] booking: display messages in frontend,
sigurdne <=