[Fmsystem-commits] [13636] more on controller

[Sigurd Nes]

Revision: 13636
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13636
Author:   sigurdne
Date:     2015-07-12 13:36:10 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
more on controller

Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/setup/phpgw_no.lang

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2015-07-10 23:33:42 UTC 
(rev 13635)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2015-07-12 13:36:10 UTC 
(rev 13636)
@@ -1089,11 +1089,11 @@
                                {
                                        if($_type == 'error')
                                        {
+                                               $i = 1;
                                                foreach($_message as $__message)
                                                {
-                                       //              $message.= 
strip_tags($__message['msg']);
-                                                       $message.= 
preg_replace("/<\/br[^>]*>\s*\r*\n*/is", "\n", $__message['msg']);
-
+                                                       $message.= "#{$i}: " . 
preg_replace("/<\/br[^>]*>\s*\r*\n*/is", "\n", $__message['msg']) . "\n";
+                                                       $i++;
                                                }
                                        }
 
@@ -1171,11 +1171,11 @@
                                
                                foreach ($required_control_items as 
$required_control_item)
                                {
-                                       $_ok = 
$this->so_case->get_cases_by_component($location_id, $component_id, 
$required_control_item['id']);
+                                       $_ok = 
$this->so_case->get_cases_by_component($location_id, $component_id, 
$required_control_item['id'],$check_list->get_id());
                                        if(!$_ok)
                                        {
-                                               $error_message =  "mangler 
registrering for required</br>";
-                                               $error_message .=  
"{$required_control_item['title']}</br>";
+                                               $error_message =  lang('missing 
value for required') . "</br>";
+                                               $error_message .=  
"\"{$required_control_item['title']}\"</br>";
                                                $error_message .= 
execMethod('property.soentity.get_short_description', array('location_id' => 
$location_id, 'id' => $component_id));
                                                $error_message .=  "</br>";
                                                
phpgwapi_cache::message_set($error_message, 'error');

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2015-07-10 23:33:42 UTC (rev 
13635)
+++ trunk/controller/setup/phpgw_no.lang        2015-07-12 13:36:10 UTC (rev 
13636)
@@ -1,3 +1,4 @@
+missing value for required     controller      no      Mangler registrering 
for obligatorisk
 Please enter billable hours    controller      no      Angi egne timer
 my assigned controls   controller      no      Mine kontroller
 add case       controller      no      Registrer sak