fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [7189] Merge 7186:7188 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [7189] Merge 7186:7188 from trunk
Date: Wed, 06 Apr 2011 10:14:46 +0000

Revision: 7189
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7189
Author:   sigurdne
Date:     2011-04-06 10:14:45 +0000 (Wed, 06 Apr 2011)
Log Message:
-----------
Merge 7186:7188 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
    branches/Version-1_0-branch/property/inc/class.soevent.inc.php
    branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php
    branches/Version-1_0-branch/property/inc/class.uievent.inc.php
    branches/Version-1_0-branch/property/js/yahoo/event.index.js
    branches/Version-1_0-branch/property/templates/base/event.xsl
    branches/Version-1_0-branch/property/templates/base/event_form.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,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185
   + 
/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,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188

Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php     
2011-04-06 10:13:16 UTC (rev 7188)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php     
2011-04-06 10:14:45 UTC (rev 7189)
@@ -847,6 +847,7 @@
                                $boevent        = 
CreateObject('property.boevent');
                                $boevent->find_scedules($criteria);
                                $schedules =  $boevent->cached_events;
+//_debug_array($schedules);die();
                                foreach($schedules as $day => $set)
                                {
                                        foreach ($set as $entry)
@@ -856,8 +857,22 @@
                                                        $event['count']++;
                                                }
                                        }
+                                       $event['responsible_id'] = 
$entry['responsible_id'];
                                }
+                               if($event['responsible_id'])
+                               {
+                                       $c = CreateObject('phpgwapi.contacts');
+                                       $qfields = array
+                                       (
+                                               'contact_id' => 'contact_id',
+                                               'per_full_name'  => 
'per_full_name',
+                                       );
 
+                                       $criteria = array('contact_id' => 
$event['responsible_id']);
+                                       $contacts = $c->get_persons($qfields, 
15, 0, '', '', $criteria);
+                                       $event['responsible'] = 
$contacts[0]['per_full_name'];
+                               }
+
                                unset($event_info);
                                unset($job_id);
                                unset($job);

Modified: branches/Version-1_0-branch/property/inc/class.soevent.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soevent.inc.php      
2011-04-06 10:13:16 UTC (rev 7188)
+++ branches/Version-1_0-branch/property/inc/class.soevent.inc.php      
2011-04-06 10:14:45 UTC (rev 7189)
@@ -45,7 +45,7 @@
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        $this->_db                      = & 
$GLOBALS['phpgw']->db;
                        $this->_join            = & $this->_db->join;
-                       $this->_left_join               = & 
$this->_db->left_join;
+                       $this->_left_join       = & $this->_db->left_join;
                        $this->_like            = & $this->_db->like;
                }
 
@@ -81,22 +81,31 @@
                                $ordermethod = ' ORDER BY schedule_time ASC';
                        }
 
+                       $where= 'WHERE';
+                       $filtermethod = '';
+                       if($user_id)
+                       {
+                               $user = 
$GLOBALS['phpgw']->accounts->get($user_id);
+                               $filtermethod = " WHERE fm_event.responsible_id 
=" . (int)$user->person_id ;
+                               $where= 'AND';
+                       }
 
-                       $filtermethod = "WHERE location_id = {$location_id}";
+                       $filtermethod .= "$where location_id = {$location_id}";
 
                        if($query)
                        {
                                $query = $this->_db->db_addslashes($query);
 
-                               $querymethod = " AND fm_event.descr 
{$this->_like} '%{$query}%'";
+                               $querymethod = " $where fm_event.descr 
{$this->_like} '%{$query}%'";
                        }
 
                        $sql = "SELECT fm_event.id, fm_event.descr, 
schedule_time, exception_time, location_id, location_item_id,"
-                               ." attrib_id, responsible_id, enabled, 
responsible_id, fm_event.user_id, fm_event_receipt.entry_date as receipt_date"
+                               ." attrib_id, responsible_id, enabled, 
fm_event.user_id, fm_event_receipt.entry_date as receipt_date,account_lid"
                                ." FROM  fm_event"
                                ." {$this->_join} fm_event_schedule ON 
(fm_event.id = fm_event_schedule.event_id)"
                                ." {$this->_left_join} fm_event_exception ON 
(fm_event_schedule.event_id = fm_event_exception.event_id AND 
fm_event_schedule.schedule_time = fm_event_exception.exception_time)"
                                ." {$this->_left_join} fm_event_receipt ON 
(fm_event_schedule.event_id = fm_event_receipt.event_id AND 
fm_event_schedule.schedule_time = fm_event_receipt.receipt_time)"
+                               ." {$this->_left_join} phpgw_accounts ON 
(fm_event.responsible_id = phpgw_accounts.person_id)"
                                ." {$filtermethod} {$querymethod}";
                        //_debug_array($sql . $ordermethod);
                        $this->_db->query($sql,__LINE__,__FILE__);
@@ -128,7 +137,7 @@
                                                        'enabled'               
        => $this->_db->f('enabled'),
                                                        'exception'             
        => $this->_db->f('exception_time') ? 'X' :'',
                                                        'receipt_date'          
=> $this->_db->f('receipt_date'),
-                                                       'responsible_id'        
=> $this->_db->f('responsible_id'),
+                                                       'account_lid'           
=> $this->_db->f('account_lid'),
                                                        'user_id'               
        => $this->_db->f('user_id')
                                                );
                                }
@@ -284,7 +293,7 @@
                                                'id'                            
=> $this->_db->f('id'),
                                                'descr'                         
=> $this->_db->f('descr', true),
                                                'start_date'            => 
$start_date,
-                                               'responsible'           => 
$this->_db->f('responsible_id'),
+                                               'responsible_id'        => 
$this->_db->f('responsible_id'),
                                                'action'                        
=> $this->_db->f('action_id'),
                                                'end_date'                      
=> $end_date,
                                                'repeat_type'           => 
$this->_db->f('repeat_type'),
@@ -349,7 +358,7 @@
                                        'user_id',
                                        'entry_date'
                                );
-                       
+                       
                                $repeat_day = 0;
                        if(isset($data['repeat_day']) && 
is_array($data['repeat_day']))
                        {
@@ -366,7 +375,7 @@
                                        $data['attrib_id'],
                                        $data['descr'],                         
                                        $data['start_date'],
-                                       $data['responsible'],
+                                       $data['responsible_id'],
                                        $data['action'],
                                        $data['end_date'],
                                        $data['repeat_type'],                   
        
@@ -380,11 +389,11 @@
                        $this->_db->transaction_begin();
 
                        $id = $this->_db->next_id($table);
-                       $cols[] = 'id';
+                       $cols[] = 'id';
                                $vals[] = $id;
 
-                       $cols   = implode(",", $cols);
-                               $vals   = $this->_db->validate_insert($vals);
+                       $cols   = implode(",", $cols);
+                               $vals   = $this->_db->validate_insert($vals);
 
                                $this->_db->query("INSERT INTO {$table} 
({$cols}) VALUES ({$vals})",__LINE__,__FILE__);
 
@@ -418,7 +427,7 @@
                                (
                                        'descr'                         => 
$this->_db->db_addslashes($data['descr']),
                                        'start_date'            => 
$data['start_date'],
-                                       'responsible_id'        => 
$data['responsible'],
+                                       'responsible_id'        => 
$data['responsible_id'],
                                        'action_id'                     => 
$data['action'],
                                        'end_date'                      => 
$data['end_date'],
                                        'repeat_type'           => 
$data['repeat_type'],
@@ -640,7 +649,7 @@
                                                                $this->account,
                                                                
phpgwapi_datetime::user_localtime(),
                                                        );                      
                        
-                                               $vals   = 
$this->_db->validate_insert($vals);
+                                               $vals   = 
$this->_db->validate_insert($vals);
                                                        
$this->_db->query("INSERT INTO fm_event_exception (event_id, exception_time, 
user_id, entry_date) VALUES ({$vals})",__LINE__,__FILE__);
                                        }
 
@@ -667,7 +676,7 @@
                                                                $this->account,
                                                                
phpgwapi_datetime::user_localtime(),
                                                        );                      
                        
-                                               $vals   = 
$this->_db->validate_insert($vals);
+                                               $vals   = 
$this->_db->validate_insert($vals);
                                                        
$this->_db->query("INSERT INTO fm_event_receipt (event_id, receipt_time, 
user_id, entry_date) VALUES ({$vals})",__LINE__,__FILE__);
                                        }
                                }
@@ -702,7 +711,7 @@
                                                $this->account,
                                                $entry_date,
                                        );                                      
        
-                               $vals   = $this->_db->validate_insert($vals);
+                               $vals   = $this->_db->validate_insert($vals);
                                        $this->_db->query("INSERT INTO 
fm_event_schedule (event_id, schedule_time, user_id, entry_date) VALUES 
({$vals})",__LINE__,__FILE__);
                        }
 
@@ -761,7 +770,7 @@
                                                $this->account,
                                                $entry_date,
                                        );                                      
        
-                               $vals   = $this->_db->validate_insert($vals);
+                               $vals   = $this->_db->validate_insert($vals);
                                        $this->_db->query("INSERT INTO 
fm_event_receipt (event_id, receipt_time, user_id, entry_date) VALUES 
({$vals})",__LINE__,__FILE__);
                                $receipt['message'][] = 
array('msg'=>"{$event_id}::{$schedule_time}");
                        }

Modified: branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php        
2011-04-06 10:13:16 UTC (rev 7188)
+++ branches/Version-1_0-branch/property/inc/class.soresponsible.inc.php        
2011-04-06 10:14:45 UTC (rev 7189)
@@ -670,10 +670,10 @@
                public function get_contact_user_id($person_id)
                {
                        $person_id = (int) $person_id;
-                       $sql = "SELECT account_id FROM phpgw_accounts WHERE 
person_id ={$person_id} AND person_id > 0";
+                       $sql = "SELECT account_id FROM phpgw_accounts WHERE 
person_id ={$person_id}";
                        $this->db->query($sql, __LINE__, __FILE__);
                        $this->db->next_record();
-                       return $this->db->f('account_id');
+                       return (int)$this->db->f('account_id');
                }
 
                /**

Modified: branches/Version-1_0-branch/property/inc/class.uievent.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uievent.inc.php      
2011-04-06 10:13:16 UTC (rev 7188)
+++ branches/Version-1_0-branch/property/inc/class.uievent.inc.php      
2011-04-06 10:14:45 UTC (rev 7189)
@@ -321,6 +321,14 @@
                        $uicols['formatter'][]  = '';
                        $uicols['input_type'][] = '';
 
+                       $uicols['name'][]               = 'account_lid';
+                       $uicols['descr'][]              = lang('account');
+                       $uicols['sortable'][]   = true;
+                       $uicols['sort_field'][] = 'account_lid';
+                       $uicols['format'][]             = '';
+                       $uicols['formatter'][]  = '';
+                       $uicols['input_type'][] = '';
+
                        $uicols['name'][]               = 'descr';
                        $uicols['descr'][]              = lang('Descr');
                        $uicols['sortable'][]   = false;
@@ -612,13 +620,13 @@
                                return;
                        }
 
-                       $location       = phpgw::get_var('location');
-                       $attrib_id      = phpgw::get_var('attrib_id');
-                       $item_id        = phpgw::get_var('item_id');//might be 
bigint
-                       $id                     = phpgw::get_var('id', 'int');
-                       $values         = phpgw::get_var('values');
+                       $location                                       = 
phpgw::get_var('location');
+                       $attrib_id                                      = 
phpgw::get_var('attrib_id');
+                       $item_id                                        = 
phpgw::get_var('item_id');//might be bigint
+                       $id                                                     
= phpgw::get_var('id', 'int');
+                       $values                                         = 
phpgw::get_var('values');
+                       $values['responsible_id']       = 
phpgw::get_var('contact', 'int', 'POST');
 
-
                        //                      
$GLOBALS['phpgw_info']['apps']['manual']['section'] = 'general.edit.' . $type;
 
                        $GLOBALS['phpgw']->xslttpl->add_file(array('event'));
@@ -638,9 +646,9 @@
                                        {
                                                
$receipt['error'][]=array('msg'=>lang('Please enter a description'));           
                                                        
                                        }
-                                       if(!isset($values['responsible']) || 
!$values['responsible'])
+                                       if(!isset($values['responsible_id']) || 
!$values['responsible_id'])
                                        {
-               //                              
$receipt['error'][]=array('msg'=>lang('Please select a responsible'));          
                                                        
+                                               
$receipt['error'][]=array('msg'=>lang('Please select a responsible'));          
                                                        
                                        }
                                        if(!isset($values['action']) || 
!$values['action'])
                                        {
@@ -694,7 +702,7 @@
                                                unset($id);
                                        }
                                }
-                               else
+                               else if ((isset($values['cancel']) && 
$values['cancel']))
                                {
                                        
$GLOBALS['phpgw']->js->add_event('load', "window.close();");
                                }
@@ -749,8 +757,14 @@
 
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
 
+                       
$contact_data=$this->bocommon->initiate_ui_contact_lookup(array(
+                               'contact_id'            => 
$values['responsible_id'],
+                               'field'                         => 'contact',
+                               'type'                          => 'form'));
+
                        $data = array
                                (
+                                       'contact_data'                          
        => $contact_data,
                                        'link_schedule'                         
        => $GLOBALS['phpgw']->link('/index.php',$link_schedule_data),
                                        'img_cal'                               
                => $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
                                        'lang_datetitle'                        
=> lang('Select date'),

Modified: branches/Version-1_0-branch/property/js/yahoo/event.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/event.index.js        
2011-04-06 10:13:16 UTC (rev 7188)
+++ branches/Version-1_0-branch/property/js/yahoo/event.index.js        
2011-04-06 10:14:45 UTC (rev 7189)
@@ -5,7 +5,7 @@
        var oMenuButton_0, oMenuButton_1;//, oMenuButton_2, oMenuButton_3;
        var selectsButtons = [
        {order:0, 
var_URL:'location_id',name:'btn_location_id',style:'locationbutton',dependiente:''},
-       {order:1, var_URL:'user_id', 
name:'btn_user_id',style:'ownerIdbutton',dependiente:''}
+       {order:1, var_URL:'user_id', 
name:'btn_user_id',style:'ownerIdbutton',dependiente:''}
 //     {order:3, 
var_URL:'status_id',name:'btn_status_id',style:'partOFTownbutton',dependiente:''},
        ];
 
@@ -37,19 +37,19 @@
        {
                date_search : 1 //if search has link "Data search"
        }
-
+
        var tableYUI;
        
/********************************************************************************
        *
        */
        this.myParticularRenderEvent = function()
-       {
+       {
                delete_content_div("message",2); //find it in property.js
                create_message();
                tableYUI.deleteTFoot();
                addFooterDatatable();
        }
-
+
        
/********************************************************************************
        * Delete all message un DIV 'message'
        */
@@ -92,7 +92,7 @@
                 }
                 window.values_ds.message = null;
        }
-
+
        this.particular_setting = function()
        {
                if(flag_particular_setting=='init')
@@ -100,48 +100,48 @@
                        //locate (asign ID) to datatable
                        tableYUI = 
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
                        tableYUI.setAttribute("id","tableYUI");
-
+
                        //category
                        index = 
locate_in_array_options(0,"value",path_values.location_id);
-                       if(index)
-                       {
-                               oMenuButton_0.set("label", ("<em>" + 
array_options[0][index][1] + "</em>"));
+                       if(index)
+                       {
+                               oMenuButton_0.set("label", ("<em>" + 
array_options[0][index][1] + "</em>"));
                        }
-
-                       //user
+
+                       //user
                        index = 
locate_in_array_options(1,"value",path_values.user_id);
-                       if(index)
-                       {
-                               oMenuButton_1.set("label", ("<em>" + 
array_options[1][index][1] + "</em>"));
-                       }
-/*
-                       //district
+                       if(index)
+                       {
+                               oMenuButton_1.set("label", ("<em>" + 
array_options[1][index][1] + "</em>"));
+                       }
+/*
+                       //district
                        index = 
locate_in_array_options(1,"value",path_values.district_id);
-                       if(index)
-                       {
-                               oMenuButton_1.set("label", ("<em>" + 
array_options[1][index][1] + "</em>"));
-                       }
-                       //status
+                       if(index)
+                       {
+                               oMenuButton_1.set("label", ("<em>" + 
array_options[1][index][1] + "</em>"));
+                       }
+                       //status
                        index = 
locate_in_array_options(2,"value",path_values.status_id);
-                       if(index)
-                       {
-                               oMenuButton_2.set("label", ("<em>" + 
array_options[2][index][1] + "</em>"));
-                       }
-                       //user
+                       if(index)
+                       {
+                               oMenuButton_2.set("label", ("<em>" + 
array_options[2][index][1] + "</em>"));
+                       }
+                       //user
                        index = 
locate_in_array_options(3,"value",path_values.user_id);
-                       if(index)
-                       {
-                               oMenuButton_3.set("label", ("<em>" + 
array_options[3][index][1] + "</em>"));
-                       }
-*/
+                       if(index)
+                       {
+                               oMenuButton_3.set("label", ("<em>" + 
array_options[3][index][1] + "</em>"));
+                       }
+*/
 //                     oMenuButton_0.focus();
-                       YAHOO.util.Dom.get(textImput[0].id).focus();
+                       YAHOO.util.Dom.get(textImput[0].id).focus();
                }
                else if(flag_particular_setting=='update')
                {
 //                     path_values.currentPage = '';
 //                     path_values.start = '';
-//                     path_values.allrows = 0;
+//                     path_values.allrows = 0;
                }
        }
 
@@ -156,26 +156,26 @@
  
 
/********************************************************************************/
        var myFormatterCheck = function(elCell, oRecord, oColumn, oData)
-       {
-               var checked = '';
-               var hidden = '';
-               if(!oRecord.getData('exception'))
-               {
-                       if(oRecord.getData('receipt_date'))
-                       {
-                               checked = "checked = 'checked'";
-                               hidden = "<input type=\"hidden\" 
class=\"orig_check\"  
name=\"values[events_orig]["+oRecord.getData('id')+"_"+oRecord.getData('schedule_time')+"]\"
 value=\""+oRecord.getData('id')+"\"/>";
-                       }
-                       
-                       elCell.innerHTML = hidden + "<center><input 
type=\"checkbox\" "+checked+" class=\"mychecks\"  
name=\"values[events]["+oRecord.getData('id')+"_"+oRecord.getData('schedule_time')+"]\"
 value=\""+oRecord.getData('id')+"\"/></center>";
+       {
+               var checked = '';
+               var hidden = '';
+               if(!oRecord.getData('exception'))
+               {
+                       if(oRecord.getData('receipt_date'))
+                       {
+                               checked = "checked = 'checked'";
+                               hidden = "<input type=\"hidden\" 
class=\"orig_check\"  
name=\"values[events_orig]["+oRecord.getData('id')+"_"+oRecord.getData('schedule_time')+"]\"
 value=\""+oRecord.getData('id')+"\"/>";
+                       }
+                       
+                       elCell.innerHTML = hidden + "<center><input 
type=\"checkbox\" "+checked+" class=\"mychecks\"  
name=\"values[events]["+oRecord.getData('id')+"_"+oRecord.getData('schedule_time')+"]\"
 value=\""+oRecord.getData('id')+"\"/></center>";
                }
        }
-
+
        var FormatterCenter = function(elCell, oRecord, oColumn, oData)
        {
                elCell.innerHTML = "<center>"+oData+"</center>";
        }
-
+
 
/********************************************************************************/
 
        this.onSave = function()
@@ -194,9 +194,9 @@
                // styles for dont show
                mydiv.style.display = "none";
                
-               valuesForPHP = 
YAHOO.util.Dom.getElementsByClassName('mychecks');
-               valuesForPHP_orig = 
YAHOO.util.Dom.getElementsByClassName('orig_check');
-
+               valuesForPHP = 
YAHOO.util.Dom.getElementsByClassName('mychecks');
+               valuesForPHP_orig = 
YAHOO.util.Dom.getElementsByClassName('orig_check');
+
                var myclone = null;
                //add all control to form
                for(i=0;i<valuesForPHP.length;i++)
@@ -217,8 +217,8 @@
                 maintain_pagination_order();
                 execute_ds();
        }
-
-
+
+
 //----------------------------------------------------------
        
/********************************************************************************
         *
@@ -227,7 +227,7 @@
        {
                //Create ROW
                newTR = document.createElement('tr');
-               td_empty(11);
+               td_empty(12);
                //RowChecked
                CreateRowChecked("mychecks");
 
@@ -238,7 +238,7 @@
                //clean value for values_ds.message
                values_ds.message = null;
        }
-
+
        
/********************************************************************************
         *
         */
@@ -270,7 +270,7 @@
                }
        }
 
-
+
        //YAHOO.util.Event.addListener(window, "load", function()
        YAHOO.util.Event.onDOMReady(function()
        {
@@ -289,4 +289,4 @@
            loader.insert();
 
        });
-
+

Modified: branches/Version-1_0-branch/property/templates/base/event.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/event.xsl       
2011-04-06 10:13:16 UTC (rev 7188)
+++ branches/Version-1_0-branch/property/templates/base/event.xsl       
2011-04-06 10:14:45 UTC (rev 7189)
@@ -48,6 +48,8 @@
                                                                        
</textarea>
                                                                </td>
                                                        </tr>
+                                                       <xsl:call-template 
name="contact_form"/>
+<!--
                                                        <tr>
                                                                <td 
valign="top">
                                                                        
<xsl:value-of select="lang_responsible"/>
@@ -56,6 +58,7 @@
                                                                        
<xsl:value-of disable-output-escaping="yes" select="responsible"/>
                                                                </td>
                                                        </tr>
+-->
                                                        <tr>
                                                                <td 
valign="top">
                                                                        
<xsl:value-of select="lang_action"/>

Modified: branches/Version-1_0-branch/property/templates/base/event_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/event_form.xsl  
2011-04-06 10:13:16 UTC (rev 7188)
+++ branches/Version-1_0-branch/property/templates/base/event_form.xsl  
2011-04-06 10:14:45 UTC (rev 7189)
@@ -51,6 +51,13 @@
                                                                <xsl:when 
test="next!=''">
                                                                        <tr>
                                                                                
<td>
+                                                                               
        <xsl:value-of select="php:function('lang', 'responsible')" />
+                                                                               
        <xsl:text>: </xsl:text>
+                                                                               
        <xsl:value-of select="responsible"/>
+                                                                               
</td>
+                                                                       </tr>
+                                                                       <tr>
+                                                                               
<td>
                                                                                
        <xsl:value-of select="lang_next_run"/>
                                                                                
        <xsl:text>: </xsl:text>
                                                                                
        <xsl:value-of select="next"/>




reply via email to

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