[Fmsystem-commits] [10339] Controler: Removed setting of action url in save form to view

[Torstein]

Revision: 10339
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10339
Author:   vator
Date:     2012-10-24 13:34:09 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Controler: Removed setting of action url in save form to view

Modified Paths:
--------------
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/templates/base/control/control.xsl

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-10-24 13:29:33 UTC 
(rev 10338)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-10-24 13:34:09 UTC 
(rev 10339)
@@ -293,8 +293,7 @@
                                'control_areas_array'           => 
$control_areas_array,
                                'procedures_array'                      => 
$procedures_array,
                                'role_array'                            => 
$role_array,
-                               'repeat_type_array'                     => 
$repeat_type_array,
-                               'action'                                        
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol.save_control_details'))
+                               'repeat_type_array'                     => 
$repeat_type_array
                        );
                        
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
@@ -532,7 +531,6 @@
                        phpgwapi_jquery::load_widget('core');
 
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
-//                     self::add_javascript('controller', 'controller', 
'jquery.js');
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                        self::render_template_xsl(array('control/control_tabs', 
'control_item/choose_control_items'), $data); 
@@ -611,7 +609,6 @@
                        phpgwapi_jquery::load_widget('core');
 
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
-//                     self::add_javascript('controller', 'controller', 
'jquery.js');
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'custom_drag_drop.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');

Modified: trunk/controller/templates/base/control/control.xsl
===================================================================
--- trunk/controller/templates/base/control/control.xsl 2012-10-24 13:29:33 UTC 
(rev 10338)
+++ trunk/controller/templates/base/control/control.xsl 2012-10-24 13:34:09 UTC 
(rev 10339)
@@ -10,7 +10,11 @@
 
 <div class="yui-content">
        <div id="control_details">
-               <form id="frm_save_control_details" action="{action}" 
method="post">
+               
+               <xsl:variable name="action_url">
+                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicontrol.save_control_details')" />
+                       </xsl:variable>
+               <form id="frm_save_control_details" action="{$action_url}" 
method="post">
                        <input type="hidden" name="control_id" 
value="{$control_id}" />
                        <input type="hidden" name="saved_control_area_id" 
value="{$control_area_id}" />