[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17556] booking: new button and redirect on event::ed
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17556] booking: new button and redirect on event::edit() |
Date: |
Thu, 11 Jan 2018 10:27:17 -0500 (EST) |
Revision: 17556
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17556
Author: sigurdne
Date: 2018-01-11 10:27:16 -0500 (Thu, 11 Jan 2018)
Log Message:
-----------
booking: new button and redirect on event::edit()
Modified Paths:
--------------
trunk/booking/inc/class.uiallocation.inc.php
trunk/booking/inc/class.uievent.inc.php
trunk/booking/setup/phpgw_no.lang
trunk/booking/templates/base/event_edit.xsl
Modified: trunk/booking/inc/class.uiallocation.inc.php
===================================================================
--- trunk/booking/inc/class.uiallocation.inc.php 2018-01-11 14:59:13 UTC
(rev 17555)
+++ trunk/booking/inc/class.uiallocation.inc.php 2018-01-11 15:27:16 UTC
(rev 17556)
@@ -575,7 +575,7 @@
$allocation['building_name'] =
$allocation['building']['name'];
$errors = array();
$tabs = array();
- $tabs['generic'] = array('label' => lang('Allocations
Edit'), 'link' => '#allocations_edit');
+ $tabs['generic'] = array('label' => lang('edit
allocation'), 'link' => '#allocations_edit');
$active_tab = 'generic';
if ($_SERVER['REQUEST_METHOD'] == 'POST')
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2018-01-11 14:59:13 UTC (rev
17555)
+++ trunk/booking/inc/class.uievent.inc.php 2018-01-11 15:27:16 UTC (rev
17556)
@@ -966,7 +966,8 @@
}
}
$receipt = $this->bo->update($event);
- $this->redirect(array('menuaction' =>
'booking.uievent.edit', 'id' => $event['id']));
+ // $this->redirect(array('menuaction' =>
'booking.uievent.edit', 'id' => $event['id']));
+ $this->redirect(array('menuaction' =>
'booking.uiapplication.show', 'id' => $event['application_id']));
}
}
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2018-01-11 14:59:13 UTC (rev 17555)
+++ trunk/booking/setup/phpgw_no.lang 2018-01-11 15:27:16 UTC (rev 17556)
@@ -717,3 +717,4 @@
ftp password booking no Ftp passord
last id booking no Siste ID
do not edit! booking no Ikke endre!
+approve booking no Godkjenn
\ No newline at end of file
Modified: trunk/booking/templates/base/event_edit.xsl
===================================================================
--- trunk/booking/templates/base/event_edit.xsl 2018-01-11 14:59:13 UTC (rev
17555)
+++ trunk/booking/templates/base/event_edit.xsl 2018-01-11 15:27:16 UTC (rev
17556)
@@ -568,11 +568,17 @@
<div class="form-buttons">
<input type="submit" class="pure-button
pure-button-primary">
<xsl:attribute name="value">
- <xsl:value-of
select="php:function('lang', 'Send')"/>
+ <xsl:value-of
select="php:function('lang', 'approve')"/>
</xsl:attribute>
</input>
<a class="cancel pure-button pure-button-primary">
<xsl:attribute name="href">
+ <xsl:value-of
select="event/application_link"/>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang',
'back')" />
+ </a>
+ <a class="cancel pure-button pure-button-primary">
+ <xsl:attribute name="href">
<xsl:value-of
select="event/cancel_link"/>
</xsl:attribute>
<xsl:value-of select="php:function('lang',
'Cancel')" />
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17556] booking: new button and redirect on event::edit(),
sigurdne <=