[Fmsystem-commits] [9655] property: check on valid category

[Sigurd Nes]

Revision: 9655
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9655
Author:   sigurdne
Date:     2012-06-25 10:21:02 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
property: check on valid category

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2012-06-24 16:29:58 UTC (rev 
9654)
+++ trunk/property/inc/class.uiproject.inc.php  2012-06-25 10:21:02 UTC (rev 
9655)
@@ -1182,6 +1182,15 @@
                                                }
                                        }
 
+                                       if(isset($values['cat_id']) && 
$values['cat_id'])
+                                       {
+                                               $_category = 
$this->cats->return_single($values['cat_id']);
+                                               if(!$_category[0]['active'])
+                                               {
+                                                       
$receipt['error'][]=array('msg'=>lang('invalid category'));
+                                               }
+                                       }
+
                                        if(!$values['coordinator'])
                                        {
                                                
$receipt['error'][]=array('msg'=>lang('Please select a coordinator !'));

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2012-06-24 16:29:58 UTC 
(rev 9654)
+++ trunk/property/inc/class.uiworkorder.inc.php        2012-06-25 10:21:02 UTC 
(rev 9655)
@@ -1046,6 +1046,15 @@
                                        
$receipt['error'][]=array('msg'=>lang('Rig addition') . ': ' . lang('Please 
enter an integer !'));
                                }
 
+                               if(isset($values['cat_id']) && 
$values['cat_id'])
+                               {
+                                       $_category = 
$this->cats->return_single($values['cat_id']);
+                                       if(!$_category[0]['active'])
+                                       {
+                                               
$receipt['error'][]=array('msg'=>lang('invalid category'));
+                                       }
+                               }
+
                                if(isset($values['addition_percentage']) && 
$values['addition_percentage'] && !ctype_digit($values['addition_percentage']))
                                {
                                        
$receipt['error'][]=array('msg'=>lang('Percentage addition') . ': ' . 
lang('Please enter an integer !'));

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2012-06-24 16:29:58 UTC (rev 9654)
+++ trunk/property/setup/phpgw_no.lang  2012-06-25 10:21:02 UTC (rev 9655)
@@ -885,6 +885,7 @@
 input text not entered!        property        no      Input tekst er ikke 
angitt!
 input type     property        no      input type
 input name     property        no      input navn
+invalid category       property        no      Ugyldig kategori
 select value   property        no      Angi verdi
 selected mail addresses        property        no      Valgte adresser
 insert the date for the acquisition    property        no      angi dato for 
anskaffelsen