fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [7106] Merge 7103:7105 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [7106] Merge 7103:7105 from trunk
Date: Thu, 10 Mar 2011 19:05:27 +0000

Revision: 7106
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7106
Author:   sigurdne
Date:     2011-03-10 19:05:26 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
Merge 7103:7105 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
    branches/Version-1_0-branch/property/inc/class.menu.inc.php
    branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
    branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
    branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
    branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
    branches/Version-1_0-branch/property/setup/phpgw_no.lang
    branches/Version-1_0-branch/property/setup/setup.inc.php
    branches/Version-1_0-branch/property/setup/tables_current.inc.php
    branches/Version-1_0-branch/property/setup/tables_update.inc.php
    branches/Version-1_0-branch/property/templates/base/generic.xsl
    branches/Version-1_0-branch/property/templates/base/request.xsl

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105

Modified: branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php    
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php    
2011-03-10 19:05:26 UTC (rev 7106)
@@ -199,10 +199,20 @@
                public function get_list($data)
                {
                        $values = $this->so->get_list($data);
-                       foreach ($values as &$entry)
+                       if(isset($data['selected']) && 
is_array($data['selected']))
                        {
-                               $entry['selected'] = isset($data['selected']) 
&& trim($data['selected']) == trim($entry['id']) ? 1 : 0;
+                               foreach ($values as &$entry)
+                               {
+                                       $entry['selected'] = 
in_array($entry['id'],$data['selected']);
+                               }
                        }
+                       else
+                       {
+                               foreach ($values as &$entry)
+                               {
+                                       $entry['selected'] = 
isset($data['selected']) && trim($data['selected']) == trim($entry['id']) ? 1 : 
0;
+                               }
+                       }
                        return $values;
                }
 

Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-03-10 
19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2011-03-10 
19:05:26 UTC (rev 7106)
@@ -405,6 +405,11 @@
                                                        'text'  => 
lang('authorities demands'),
                                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.index', 'type' => 'authorities_demands') )
                                                ),
+                                               'regulations'   => array
+                                               (
+                                                       'text'  => 
lang('regulations'),
+                                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.index', 'type' => 'regulations') )
+                                               ),
                                                'request_attribs'       => array
                                                (
                                                        'text'  => 
lang('request Attributes'),

Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php    
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php    
2011-03-10 19:05:26 UTC (rev 7106)
@@ -123,7 +123,7 @@
                                $uicols['input_type'][]         = 
isset($field['hidden']) && $field['hidden'] ? 'hidden' : 'text';
                                $uicols['name'][]                       = 
$field['name'];
                                $uicols['descr'][]                      = 
$field['descr'];
-                               $uicols['datatype'][]           = 'V';
+                               $uicols['datatype'][]           = 
$field['type'];
                                $uicols['sortable'][]           = 
isset($field['sortable']) && $field['sortable'] ? true : false;
                                $uicols['formatter'][]          = 
$field['type'] == 'int' ? 'FormatterRight' : '';
                        }
@@ -1562,6 +1562,48 @@
                                                'menu_selection'        => 
'admin::property::ticket_status'
                                        );
                                break;
+
+
+                       case 'regulations':
+                               $info = array
+                                       (
+                                               'table'                         
=> 'fm_regulations',
+                                               'id'                            
=> array('name' => 'id', 'type' => 'auto'),
+                                               'fields'                        
=> array
+                                               (
+                                                       array
+                                                       (
+                                                               'name' => 
'name',
+                                                               'descr' => 
lang('name'),
+                                                               'type' => 
'varchar'
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'descr',
+                                                               'descr' => 
lang('descr'),
+                                                               'type' => 'text'
+                                                       ),
+                                                       array
+                                                       (
+                                                               'name' => 
'external_ref',
+                                                               'descr' => 
lang('external ref'),
+                                                               'type' => 'link'
+                                                       )
+                                               ),
+                                               'edit_msg'                      
=> lang('edit'),
+                                               'add_msg'                       
=> lang('add'),
+                                               'name'                          
=> lang('regulations'),
+                                               'acl_app'                       
=> 'property',
+                                               'acl_location'          => 
'.admin',
+                                               'menu_selection'        => 
'admin::property::regulations',
+                                               'default'                       
=> array
+                                               (
+                                                       'user_id'               
=> array('add'  => '$this->account'),
+                                                       'entry_date'    => 
array('add'  => 'time()'),
+                                                       'modified_date' => 
array('edit' => 'time()'),
+                                               )
+                                       );
+                               break;
 //START HELPDESK - APP
                        case 'helpdesk_status':
                                // the helpdesk app
@@ -2043,6 +2085,9 @@
 
                        $this->_db->query("SELECT id, {$fields} FROM {$table} 
{$filtermthod} {$ordermethod}");
 
+                       $return_fields = isset($data['fields']) && 
$data['fields'] && is_array($data['fields']) ? $data['fields'] : array();
+                       
+                       $i = 0;
                        while ($this->_db->next_record())
                        {
                                $_extra = $this->_db->f($id_in_name);
@@ -2057,11 +2102,18 @@
                                        $name = "{$_extra} - {$name}";
                                }
 
-                               $values[] = array
-                                       (
-                                               'id'    => $id,
-                                               'name'  => $name
-                                       );
+                               $values[$i] = array
+                               (
+                                       'id'    => $id,
+                                       'name'  => $name
+                               );
+
+                               foreach ($return_fields as $return_field)
+                               {
+                                       $values[$i][$return_field] = 
$this->_db->f($return_field, true);
+                               }
+
+                               $i++;
                        }
                        return $values;
                }

Modified: branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sorequest.inc.php    
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/inc/class.sorequest.inc.php    
2011-03-10 19:05:26 UTC (rev 7106)
@@ -468,7 +468,8 @@
                                                'entry_date'                    
=> $this->db->f('entry_date'),
                                                'closed_date'                   
=> $this->db->f('closed_date'),
                                                'in_progress_date'              
=> $this->db->f('in_progress_date'),
-                                               'delivered_date'                
=> $this->db->f('delivered_date')
+                                               'delivered_date'                
=> $this->db->f('delivered_date'),
+                                               'regulations'                   
=> explode(',', $this->db->f('regulations'))
                                        );
 
                                if ( isset($values['attributes']) && 
is_array($values['attributes']) )
@@ -585,6 +586,7 @@
                        $value_set['building_part']                     = 
$request['building_part'];
                        $value_set['start_date']                        = 
$request['start_date'];
                        $value_set['end_date']                          = 
$request['end_date'];
+                       $value_set['regulations']                       = 
$request['regulations'] ? ',' . implode(',',$request['regulations']) . ',' : '';
 
                        $cols = implode(',', array_keys($value_set));
                        $values = 
$this->bocommon->validate_db_insert(array_values($value_set));
@@ -688,20 +690,21 @@
                        }
 
                        $value_set = array
-                               (
-                                       'title'                                 
=> $this->db->db_addslashes($request['title']),
-                                       'status'                                
=> $request['status'],
-                                       'category'                              
=> $request['cat_id'],
-                                       'start_date'                    => 
$request['start_date'],
-                                       'end_date'                              
=> $request['end_date'],
-                                       'coordinator'                   => 
$request['coordinator'],
-                                       'descr'                                 
=> $this->db->db_addslashes($request['descr']),
-                                       'budget'                                
=> (int)$request['budget'],
-                                       'location_code'                 => 
$request['location_code'],
-                                       'address'                               
=> $address,
-                                       'authorities_demands'   => 
$request['authorities_demands'],
-                                       'building_part'                 => 
$request['building_part'],
-                               );
+                       (
+                               'title'                                 => 
$this->db->db_addslashes($request['title']),
+                               'status'                                => 
$request['status'],
+                               'category'                              => 
$request['cat_id'],
+                               'start_date'                    => 
$request['start_date'],
+                               'end_date'                              => 
$request['end_date'],
+                               'coordinator'                   => 
$request['coordinator'],
+                               'descr'                                 => 
$this->db->db_addslashes($request['descr']),
+                               'budget'                                => 
(int)$request['budget'],
+                               'location_code'                 => 
$request['location_code'],
+                               'address'                               => 
$address,
+                               'authorities_demands'   => 
$request['authorities_demands'],
+                               'building_part'                 => 
$request['building_part'],
+                               'regulations'                   => 
$request['regulations'] ? ',' . implode(',',$request['regulations']) . ',' : ''
+                       );
 
                        while (is_array($request['location']) && 
list($input_name,$value) = each($request['location']))
                        {

Modified: branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php    
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php    
2011-03-10 19:05:26 UTC (rev 7106)
@@ -360,6 +360,7 @@
                                                {
                                                        
$datatable['rows']['row'][$j]['column'][$k]['name']             = 
$uicols['name'][$k];
                                                        
$datatable['rows']['row'][$j]['column'][$k]['value']            = 
$entry[$uicols['name'][$k]];
+                                                       
$datatable['rows']['row'][$j]['column'][$k]['format']           = 
$uicols['datatype'][$k];
                                                }
                                        }
                                        $j++;
@@ -501,14 +502,18 @@
                                        $json_row = array();
                                        foreach( $row['column'] as $column)
                                        {
-                                               if(isset($column['format']) && 
$column['format']== "link" && $column['java_link']==true)
+                                               if(isset($column['format']) && 
$column['format']== 'link' && $column['java_link']==true)
                                                {
-                                                       
$json_row[$column['name']] = "<a href='#' id='".$column['link']."' 
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
+                                                       
$json_row[$column['name']] = "<a href='#' id='{$column['link']}' 
onclick='javascript:filter_data(this.id);'>{$column['value']}</a>";
                                                }
-                                               else 
if(isset($column['format']) && $column['format']== "link")
+                                               else 
if(isset($column['format']) && $column['format']== 'link')
                                                {
-                                                       
$json_row[$column['name']] = "<a href='".$column['link']."'>" 
.$column['value']."</a>";
+                                                       
$json_row[$column['name']] = "<a href='{$column['value']}' target='_blank'>" 
.lang('link') . '</a>';
                                                }
+                                               else 
if(isset($column['format']) && $column['format']== 'text')
+                                               {
+                                                       
$json_row[$column['name']] = nl2br($column['value']);
+                                               }
                                                else
                                                {
                                                        
$json_row[$column['name']] = $column['value'];

Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php    
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php    
2011-03-10 19:05:26 UTC (rev 7106)
@@ -1408,11 +1408,12 @@
                                        'currency'                              
                        => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
 
                                        'authorities_demands'                   
        => array('options' => 
execMethod('property.bogeneric.get_list',array('type' => 'authorities_demands', 
'selected' => $values['authorities_demands']))),
+                                       'regulations'                           
                => execMethod('property.bogeneric.get_list',array('type' => 
'regulations', 'selected' => $values['regulations'], 'fields' => array('descr', 
'external_ref'))),
 
                                        'condition_list'                        
                => $this->bo->select_conditions($id),
                                        'building_part_list'                    
        => array('options' => 
$this->bocommon->select_category_list(array('type'=> 'building_part','selected' 
=>$values['building_part'], 'order' => 'id', 'id_in_name' => 'num' ))),
                                );
-
+//_debug_array($data['regulations']);die();
                        phpgwapi_yui::load_widget('dragdrop');
                        phpgwapi_yui::load_widget('datatable');
                        phpgwapi_yui::load_widget('menu');

Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang    2011-03-10 
19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang    2011-03-10 
19:05:26 UTC (rev 7106)
@@ -750,6 +750,7 @@
 export date    property        no      Eksport dato
 export invoice property        no      Overfør
 export to file property        no      Eksport til fil
+external ref   property        no      Ekstern referanse
 extra  property        no      Ekstra
 extra mail address     property        no      Ekstra adresse
 f      property        no      F
@@ -1264,6 +1265,7 @@
 receipt        property        no      Kvittering
 receipt date   property        no      Kvitteringsdato
 record property        no      Post
+regulations    property        no      Forskrifter
 related        property        no      Relatert
 related info   property        no      Relatert info
 remark property        no      Merknad

Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php    2011-03-10 
19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php    2011-03-10 
19:05:26 UTC (rev 7106)
@@ -12,7 +12,7 @@
        */
 
        $setup_info['property']['name']                 = 'property';
-       $setup_info['property']['version']              = '0.9.17.612';
+       $setup_info['property']['version']              = '0.9.17.613';
        $setup_info['property']['app_order']    = 8;
        $setup_info['property']['enable']               = 1;
        $setup_info['property']['app_group']    = 'office';
@@ -194,7 +194,8 @@
                'fm_jasper_input_type',
                'fm_jasper_format_type',
                'fm_jasper_input',
-               'fm_custom_menu_items'
+               'fm_custom_menu_items',
+               'fm_regulations'
        );
 
        /* The hooks this app includes, needed for hooks registration */

Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php   
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php   
2011-03-10 19:05:26 UTC (rev 7106)
@@ -798,6 +798,7 @@
                                'closed_date' => array('type' => 
'int','precision' => '4','nullable' => True),
                                'in_progress_date' => array('type' => 
'int','precision' => '4','nullable' => True),
                                'delivered_date' => array('type' => 
'int','precision' => '4','nullable' => True),
+                               'regulations' => array('type' => 
'varchar','precision' => 100,'nullable' => True),
                        ),
                        'pk' => array('id'),
                        'fk' => array(),
@@ -1175,7 +1176,7 @@
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()
-                       ),
+               ),
                'fm_event' =>array(
                        'fd' => array(
                                'id' => array('type' => 'auto','precision' => 
4,'nullable' => False),
@@ -2216,5 +2217,20 @@
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()
+               ),
+               'fm_regulations' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'int','precision' => 
4,'nullable' => False),
+                               'name' =>  array('type' => 
'varchar','precision' => 255,'nullable' => False),
+                               'descr' => array('type' => 'text','nullable' => 
True),
+                               'external_ref' =>  array('type' => 
'varchar','precision' => 255,'nullable' => True),
+                               'user_id' => array('type' => 'int','precision' 
=> 4,'nullable' => True),
+                               'entry_date' => array('type' => 
'int','precision' => 4,'nullable' => True),
+                               'modified_date' => array('type' => 
'int','precision' => 4,'nullable' => True)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
                )
        );

Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php    
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php    
2011-03-10 19:05:26 UTC (rev 7106)
@@ -5107,8 +5107,45 @@
                }
        }
 
+       /**
+       * Update property version from 0.9.17.612 to 0.9.17.613
+       * Add regulations
+       * 
+       */
 
+       $test[] = '0.9.17.612';
+       function property_upgrade0_9_17_612()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
 
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_request','regulations', 
array('type' => 'varchar','precision' => 100,'nullable' => True));
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+                       'fm_regulations' , array(
+                               'fd' => array(
+                                       'id' => array('type' => 
'int','precision' => 4,'nullable' => False),
+                                       'name' =>  array('type' => 
'varchar','precision' => 255,'nullable' => False),
+                                       'descr' => array('type' => 
'text','nullable' => True),
+                                       'external_ref' =>  array('type' => 
'varchar','precision' => 255,'nullable' => True),
+                                       'user_id' => array('type' => 
'int','precision' => 4,'nullable' => True),
+                                       'entry_date' => array('type' => 
'int','precision' => 4,'nullable' => True),
+                                       'modified_date' => array('type' => 
'int','precision' => 4,'nullable' => True)
+                               ),
+                               'pk' => array('id'),
+                               'fk' => array(),
+                               'ix' => array(),
+                               'uc' => array()
+                       )
+               );
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.613';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }
+
+
        /**
        * Update property version from 0.9.17.607 to 0.9.17.608
        * Add more room for address at tickets

Modified: branches/Version-1_0-branch/property/templates/base/generic.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/generic.xsl     
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/templates/base/generic.xsl     
2011-03-10 19:05:26 UTC (rev 7106)
@@ -133,6 +133,22 @@
                                                                                
                        </xsl:for-each>
                                                                                
                </select>
                                                                                
        </xsl:when>
+                                                                               
        <xsl:when test="type='link'">
+                                                                               
                <input type="text" name="values[{name}]" value="{value}" 
size="30">
+                                                                               
                        <xsl:choose>
+                                                                               
                                <xsl:when test="disabled!=''">
+                                                                               
                                        <xsl:attribute name="disabled">
+                                                                               
                                                <xsl:text> disabled</xsl:text>
+                                                                               
                                        </xsl:attribute>
+                                                                               
                                </xsl:when>
+                                                                               
                        </xsl:choose>
+                                                                               
                </input>
+                                                                               
                <xsl:choose>
+                                                                               
                        <xsl:when test="value!=''">
+                                                                               
                                <br/><a href="{value}" 
target="_blank"><xsl:value-of select="value"/></a>
+                                                                               
                        </xsl:when>
+                                                                               
                </xsl:choose>
+                                                                               
        </xsl:when>
                                                                                
</xsl:choose>
                                                                        </td>
                                                                </tr>

Modified: branches/Version-1_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/request.xsl     
2011-03-10 19:01:45 UTC (rev 7105)
+++ branches/Version-1_0-branch/property/templates/base/request.xsl     
2011-03-10 19:05:26 UTC (rev 7106)
@@ -460,6 +460,56 @@
                                                                                
                </select>                       
                                                                                
        </td>
                                                                                
</tr>
+
+                                                                               
<tr>
+                                                                               
        <td valign='top' align="left">
+                                                                               
                <xsl:value-of select="php:function('lang', 'regulations')" />
+                                                                               
        </td>
+                                                                               
        <td colspan='3'>
+                                                                               
                <table cellpadding="2" cellspacing="2" width="50%" align="left">
+                                                                               
                        <xsl:for-each select="regulations" >
+                                                                               
                                <tr>
+                                                                               
                                        <xsl:attribute name="class">
+                                                                               
                                                <xsl:choose>
+                                                                               
                                                        <xsl:when test="@class">
+                                                                               
                                                                <xsl:value-of 
select="@class"/>
+                                                                               
                                                        </xsl:when>
+                                                                               
                                                        <xsl:when 
test="position() mod 2 = 0">
+                                                                               
                                                                
<xsl:text>row_off</xsl:text>
+                                                                               
                                                        </xsl:when>
+                                                                               
                                                                <xsl:otherwise>
+                                                                               
                                                                        
<xsl:text>row_on</xsl:text>
+                                                                               
                                                                </xsl:otherwise>
+                                                                               
                                                        </xsl:choose>
+                                                                               
                                                </xsl:attribute>
+                                                                               
                                        <td align="left" title='{descr}'>
+                                                                               
                                                <xsl:text> </xsl:text>
+                                                                               
                                                <xsl:choose>
+                                                                               
                                                        <xsl:when 
test="external_ref!=''">
+                                                                               
                                                                <a 
href="{external_ref}" target="_blank"><xsl:value-of select="name"/></a>
+                                                                               
                                                        </xsl:when>
+                                                                               
                                                        <xsl:otherwise>
+                                                                               
                                                                <xsl:value-of 
select="name"/>
+                                                                               
                                                        </xsl:otherwise>
+                                                                               
                                                </xsl:choose>
+                                                                               
                                        </td>
+                                                                               
                                        <td align="left">
+                                                                               
                                                <input type="checkbox" 
name="values[regulations][]" value="{id}">
+                                                                               
                                                        <xsl:if test="selected 
= '1'">
+                                                                               
                                                                <xsl:attribute 
name="checked">
+                                                                               
                                                                        
<xsl:text>checked</xsl:text>
+                                                                               
                                                                </xsl:attribute>
+                                                                               
                                                        </xsl:if>
+                                                                               
                                                        <xsl:attribute 
name="title">
+                                                                               
                                                                <xsl:value-of 
select="descr"/>
+                                                                               
                                                        </xsl:attribute>
+                                                                               
                                                </input>
+                                                                               
                                        </td>
+                                                                               
                                </tr>
+                                                                               
                        </xsl:for-each>
+                                                                               
                </table>
+                                                                               
        </td>
+                                                                               
</tr>
                                                                                
<xsl:call-template name="attributes"/>
                                                                                
<tr>
                                                                                
        <td align="left">




reply via email to

[Prev in Thread] Current Thread [Next in Thread]