[Fmsystem-commits] [8751] altered datatype of column reference on table procedure from varchar to text

[Erik Holm-Larsen]

Revision: 8751
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8751
Author:   erikhl
Date:     2012-02-01 08:59:59 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
altered datatype of column reference on table procedure from varchar to text
added WYSIWYG to input-field for reference on procedure item

Modified Paths:
--------------
    trunk/controller/inc/class.uiprocedure.inc.php
    trunk/controller/setup/setup.inc.php
    trunk/controller/setup/tables_current.inc.php
    trunk/controller/setup/tables_update.inc.php
    trunk/controller/templates/base/procedure/procedure_item.xsl

Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php      2012-02-01 08:01:05 UTC 
(rev 8750)
+++ trunk/controller/inc/class.uiprocedure.inc.php      2012-02-01 08:59:59 UTC 
(rev 8751)
@@ -190,7 +190,7 @@
                                        
$procedure->set_purpose(phpgw::get_var('purpose','html'));
                                        
$procedure->set_responsibility(phpgw::get_var('responsibility'));
                                        
$procedure->set_description(phpgw::get_var('description','html'));
-                                       
$procedure->set_reference(phpgw::get_var('reference'));
+                                       
$procedure->set_reference(phpgw::get_var('reference','html'));
                                        
$procedure->set_attachment(phpgw::get_var('attachment'));
                                        
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
                                        
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
@@ -253,7 +253,7 @@
                                        
$procedure->set_purpose(phpgw::get_var('purpose','html'));
                                        
$procedure->set_responsibility(phpgw::get_var('responsibility'));
                                        
$procedure->set_description(phpgw::get_var('description','html'));
-                                       
$procedure->set_reference(phpgw::get_var('reference'));
+                                       
$procedure->set_reference(phpgw::get_var('reference','html'));
                                        
$procedure->set_attachment(phpgw::get_var('attachment'));
                                        
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
                                        
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
@@ -366,7 +366,7 @@
 
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Procedure');
 
-                               
$this->use_yui_editor(array('responsibility','description'));
+                               
$this->use_yui_editor(array('responsibility','description', 'reference'));
 
                                
self::render_template_xsl(array('procedure/procedure_tabs', 'common', 
'procedure/procedure_item'), $data);
                        }

Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php        2012-02-01 08:01:05 UTC (rev 
8750)
+++ trunk/controller/setup/setup.inc.php        2012-02-01 08:59:59 UTC (rev 
8751)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['controller']['name'] = 'controller';
-       $setup_info['controller']['version'] = '0.1.23';
+       $setup_info['controller']['version'] = '0.1.24';
        $setup_info['controller']['app_order'] = 100;
        $setup_info['controller']['enable'] = 1;
        $setup_info['controller']['app_group']  = 'office';

Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php       2012-02-01 08:01:05 UTC 
(rev 8750)
+++ trunk/controller/setup/tables_current.inc.php       2012-02-01 08:59:59 UTC 
(rev 8751)
@@ -91,7 +91,7 @@
                                'purpose' => array('type' => 'text', 'nullable' 
=> True),
                                'responsibility' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
                                'description' => array('type' => 'text', 
'nullable' => True),
-                               'reference' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
+                               'reference' => array('type' => 'text', 
'nullable' => True),
                                'attachment' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => True),
                                'start_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => True),
                                'end_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => True),

Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php        2012-02-01 08:01:05 UTC 
(rev 8750)
+++ trunk/controller/setup/tables_update.inc.php        2012-02-01 08:59:59 UTC 
(rev 8751)
@@ -496,3 +496,15 @@
                        return 
$GLOBALS['setup_info']['controller']['currentver'];
                }               
        }
+       
+       $test[] = '0.1.23';
+       function controller_upgrade0_1_23()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AlterColumn('controller_procedure','reference',array(
+                       'type' => 'text', 
+                       'nullable' => true
+               ));
+               
+               $GLOBALS['setup_info']['controller']['currentver'] = '0.1.24';
+               return $GLOBALS['setup_info']['controller']['currentver'];
+       }

Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl        
2012-02-01 08:01:05 UTC (rev 8750)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl        
2012-02-01 08:59:59 UTC (rev 8751)
@@ -137,26 +137,13 @@
                                        <dd>
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <input type="text" 
name="reference" id="reference" value="{procedure/reference}"  />
+                                                       <textarea 
id="reference" name="reference" rows="5" cols="60"><xsl:value-of 
select="procedure/reference" disable-output-escaping="yes"/></textarea>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <xsl:value-of 
select="procedure/reference" />
+                                                       <xsl:value-of 
select="procedure/reference" disable-output-escaping="yes"/>
                                                </xsl:otherwise>
                                        </xsl:choose>
-                                       </dd>   
-                                       <dt>
-                                       <label for="attachment"><xsl:value-of 
select="php:function('lang','Procedure Attachment')" /></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <input type="text" 
name="attachment" id="attachment" value="{procedure/attachment}"  />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="procedure/attachment" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>                   
+                                       </dd>                           
                                </dl>
                                
                                <div class="form-buttons">