[Fmsystem-commits] [17010] property: more on location exceptions

[sigurdne]

Revision: 17010
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17010
Author:   sigurdne
Date:     2017-08-30 07:42:49 -0400 (Wed, 30 Aug 2017)
Log Message:
-----------
property: more on location exceptions

Modified Paths:
--------------
    trunk/property/inc/class.sogeneric.inc.php
    trunk/property/setup/phpgw_no.lang
    trunk/property/setup/tables_current.inc.php
    trunk/property/setup/tables_update.inc.php

Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php  2017-08-29 18:23:19 UTC (rev 
17009)
+++ trunk/property/inc/class.sogeneric.inc.php  2017-08-30 11:42:49 UTC (rev 
17010)
@@ -2622,6 +2622,26 @@
                                                                        
'method_input' => array('role' => 'parent', 'type' => 
'location_exception_category', 'selected' => '##category_id##')
                                                                )
                                                        ),
+//                                                     array
+//                                                     (
+//                                                             'name' => 
'category_text_id',
+//                                                             'descr' => 
lang('category content'),
+//                                                             'type' => 
'select',
+//                                                             'nullable' => 
true,
+//                                                             'filter' => 
false,
+//                                                             'sortable' => 
true,
+//                                                             'values_def' => 
array
+//                                                             (
+//                                                                     
'valueset' => false,
+//                                                                     
'method' => 'property.bogeneric.get_list',
+//                                                                     
'get_single_value' => 'property.sogeneric.get_name',
+//                                                                     
'method_input' => array(
+//                                                                             
'type' => 'location_exception_category_text',
+//                                                                             
'selected' => '##category_text_id##',
+////                                                                   //      
'filter'        => array('category_id' => '##category_id##')
+//                                                                             
)
+//                                                             )
+//                                                     ),
                                                        array
                                                                (
                                                                'name' => 
'alert_vendor',

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2017-08-29 18:23:19 UTC (rev 17009)
+++ trunk/property/setup/phpgw_no.lang  2017-08-30 11:42:49 UTC (rev 17010)
@@ -2234,4 +2234,5 @@
 severity category text property        no      Tekster for kategori for 
alvorlighetsgrad
 reference      property        no      Referanse
 alert vendor   property        no      Varsle leverandør
-important information  property        no      Viktig informasjon
\ No newline at end of file
+important information  property        no      Viktig informasjon
+category content       property        no      Tekster for kategori
\ No newline at end of file

Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2017-08-29 18:23:19 UTC (rev 
17009)
+++ trunk/property/setup/tables_current.inc.php 2017-08-30 11:42:49 UTC (rev 
17010)
@@ -2932,6 +2932,7 @@
                                'location_code' => array('type' => 'varchar', 
'precision' => 20, 'nullable' => False),
                                'severity_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
                                'category_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => False),
+                               'category_text_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => true),
                                'descr' => array('type' => 'text', 'nullable' 
=> True),
                                'start_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => False),
                                'end_date' => array('type' => 'int', 
'precision' => 8, 'nullable' => true),

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2017-08-29 18:23:19 UTC (rev 
17009)
+++ trunk/property/setup/tables_update.inc.php  2017-08-30 11:42:49 UTC (rev 
17010)
@@ -9729,7 +9729,7 @@
        }
 
        /**
-       * Update property version from 0.9.17.714 to 0.9.17.715
+       * Update property version from 0.9.17.715 to 0.9.17.716
        *
        */
        $test[] = '0.9.17.715';
@@ -9747,4 +9747,23 @@
                        return $GLOBALS['setup_info']['property']['currentver'];
                }
        }
-       
\ No newline at end of file
+
+       /**
+       * Update property version from 0.9.17.716 to 0.9.17.717
+       *
+       */
+       $test[] = '0.9.17.716';
+
+       function property_upgrade0_9_17_716()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_location_exception', 
'category_text_id', array(
+                       'type' => 'int', 'precision' => 4, 'nullable' => true));
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.717';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }