[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17372] controller: FDV-288
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17372] controller: FDV-288 |
Date: |
Mon, 27 Nov 2017 10:46:01 -0500 (EST) |
Revision: 17372
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17372
Author: sigurdne
Date: 2017-11-27 10:46:00 -0500 (Mon, 27 Nov 2017)
Log Message:
-----------
controller: FDV-288
Modified Paths:
--------------
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/procedure/procedure_item.xsl
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2017-11-27 14:01:42 UTC
(rev 17371)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2017-11-27 15:46:00 UTC
(rev 17372)
@@ -208,6 +208,8 @@
'id' => $procedure_id));
}
+ $edit_mode = phpgw::get_var('edit_mode');
+
$error = false;
if (isset($_POST['save_procedure'])) // The user has
pressed the save button
@@ -482,10 +484,21 @@
'procedure' => $procedure_array,
//'control_area'
=> array('options' => $control_area_options),
'control_area' => array('options' =>
$control_areas_array2),
+ 'edit_mode' => $edit_mode
);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Procedure');
+
+ switch ($edit_mode)
+ {
+ case 'edit_procedure':
+
$GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . lang('edit');
+ break;
+ default:
+
$GLOBALS['phpgw_info']['flags']['app_header'] .= '::' . lang('new revision');
+ break;
+ }
phpgwapi_jquery::formvalidator_generate(array('date', 'security','file'));
$this->use_yui_editor(array('responsibility',
'description', 'reference'));
@@ -531,8 +544,13 @@
if (isset($_POST['edit_procedure']))
{
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uiprocedure.edit',
- 'id' => $procedure_id));
+ 'id' => $procedure_id, 'edit_mode' =>
'edit_procedure' ));
}
+ else if (isset($_POST['new_revison']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uiprocedure.edit',
+ 'id' => $procedure_id, 'edit_mode' =>
'new_revison' ));
+ }
else
{
//Retrieve the procedure object
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2017-11-27 14:01:42 UTC (rev
17371)
+++ trunk/controller/setup/phpgw_no.lang 2017-11-27 15:46:00 UTC (rev
17372)
@@ -408,4 +408,5 @@
Do not edit archived version controller no Du kan ikke endre
arkiverte versjoner
choose a location controller no Velg en lokasjon
deadline end of year controller no Frist på slutten av året for
årskontroller
-missing start date controller no Mangler startdato
\ No newline at end of file
+missing start date controller no Mangler startdato
+new revision controller no Ny revisjon
\ No newline at end of file
Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl
2017-11-27 14:01:42 UTC (rev 17371)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl
2017-11-27 15:46:00 UTC (rev 17372)
@@ -174,9 +174,9 @@
<xsl:value-of
select="procedure/reference" disable-output-escaping="yes"/>
</xsl:otherwise>
</xsl:choose>
- </dd>
+ </dd>
</dl>
-
+
<div class="form-buttons">
<xsl:choose>
<xsl:when test="editable">
@@ -184,13 +184,19 @@
<xsl:value-of
select="php:function('lang', 'save')" />
</xsl:variable>
<xsl:variable
name="lang_revisit">
- <xsl:value-of
select="php:function('lang', 'revisit')" />
+ <xsl:value-of
select="php:function('lang', 'new revision')" />
</xsl:variable>
<xsl:variable
name="lang_cancel">
<xsl:value-of
select="php:function('lang', 'cancel')" />
</xsl:variable>
- <input type="submit"
name="save_procedure" value="{$lang_save}" title = "{$lang_save}" />
- <input type="submit"
name="revisit_procedure" value="{$lang_revisit}" title = "{$lang_revisit}" />
+ <xsl:choose>
+ <xsl:when
test="edit_mode = 'edit_procedure'">
+ <input
type="submit" name="save_procedure" value="{$lang_save}" title = "{$lang_save}"
/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input
type="submit" name="revisit_procedure" value="{$lang_revisit}" title =
"{$lang_revisit}" />
+ </xsl:otherwise>
+ </xsl:choose>
<input type="submit"
name="cancel_procedure" value="{$lang_cancel}" title = "{$lang_cancel}" />
</xsl:when>
<xsl:when test="inactive">
@@ -204,6 +210,10 @@
<xsl:value-of
select="php:function('lang', 'edit')" />
</xsl:variable>
<input type="submit"
name="edit_procedure" value="{$lang_edit}" title = "{$lang_edit}" />
+ <xsl:variable
name="lang_new_revison">
+ <xsl:value-of
select="php:function('lang', 'new revision')" />
+ </xsl:variable>
+ <input type="submit"
name="new_revison" value="{$lang_new_revison}" title = "{$lang_new_revison}" />
</xsl:otherwise>
</xsl:choose>
</div>
@@ -260,7 +270,7 @@
</tr>
</xsl:for-each>
</xsl:template>
-
+
<xsl:template match="options">
<option value="{id}">
<xsl:if test="selected">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17372] controller: FDV-288,
sigurdne <=