[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14903] Merge 14899:14902 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14903] Merge 14899:14902 from trunk |
Date: |
Thu, 07 Apr 2016 07:33:59 +0000 |
Revision: 14903
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14903
Author: sigurdne
Date: 2016-04-07 07:33:56 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Merge 14899:14902 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
branches/Version-2_0-branch/frontend/inc/class.uihelpdesk.inc.php
branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896
+ /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902
Modified:
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2016-04-07 07:30:53 UTC (rev 14902)
+++
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2016-04-07 07:33:56 UTC (rev 14903)
@@ -394,7 +394,11 @@
$redirect_params['export_key'] = $export_key;
}
- $this->flash_form_errors($export_errors);
+// $this->flash_form_errors($export_errors);
+ foreach ($export_errors as $key => $value)
+ {
+ phpgwapi_cache::message_set($value, 'error');
+ }
$this->redirect_to('index', $redirect_params);
}
Modified: branches/Version-2_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-2_0-branch/frontend/inc/class.uihelpdesk.inc.php
2016-04-07 07:30:53 UTC (rev 14902)
+++ branches/Version-2_0-branch/frontend/inc/class.uihelpdesk.inc.php
2016-04-07 07:33:56 UTC (rev 14903)
@@ -149,6 +149,7 @@
'my_name' => 'new_ticket',
'text' => lang('new_ticket'),
'type' => 'custom',
+ 'className' => 'new_ticket',//activate button
'custom_code' => "
var oArgs = " .
json_encode(array(
'menuaction' =>
'frontend.uihelpdesk.add_ticket',
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
2016-04-07 07:30:53 UTC (rev 14902)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/css/base.css
2016-04-07 07:33:56 UTC (rev 14903)
@@ -19,11 +19,11 @@
{
border: 0px;
}
-
+/*
textarea
{
white-space: normal;
-}
+}*/
thead
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14903] Merge 14899:14902 from trunk,
Sigurd Nes <=