[Fmsystem-commits] [15069] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15069
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15069
Author:   sigurdne
Date:     2016-05-13 12:06:10 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.sogeneric.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.sogeneric.inc.php      
2016-05-13 12:06:07 UTC (rev 15068)
+++ branches/dev-syncromind-2/property/inc/class.sogeneric.inc.php      
2016-05-13 12:06:10 UTC (rev 15069)
@@ -1074,8 +1074,7 @@
                                                                'descr' => 
lang('descr'),
                                                                'type' => 
'varchar'
                                                        ),
-                                                       array
-                                                               (
+                                                       array(
                                                                'name' => 
'active',
                                                                'descr' => 
lang('active'),
                                                                'type' => 
'checkbox',
@@ -1234,8 +1233,7 @@
                                                'table' => 
'fm_external_project',
                                                'id' => array('name' => 'id', 
'type' => 'varchar'),
                                                'fields' => array(
-                                                       array
-                                                               (
+                                                       array(
                                                                'name' => 
'name',
                                                                'descr' => 
lang('name'),
                                                                'type' => 
'varchar'
@@ -1244,6 +1242,18 @@
                                                                'name' => 
'budget',
                                                                'descr' => 
lang('budget'),
                                                                'type' => 'int'
+                                                       ),
+                                                       array(
+                                                               'name' => 
'active',
+                                                               'descr' => 
lang('active'),
+                                                               'type' => 
'checkbox',
+                                                               'default' => 
'checked',
+                                                               'filter' => 
true,
+                                                               'sortable' => 
true,
+                                                               'values_def' => 
array
+                                                                       (
+                                                                       
'valueset' => array(array('id' => 1, 'name' => lang('active'))),
+                                                               )
                                                        )
                                                ),
                                                'edit_msg' => lang('edit'),