[Phpgroupware-cvs] ged/inc class.ged_ui.inc.php

[Pascal Vilarem]

CVSROOT:        /sources/phpgroupware
Module name:    ged
Changes by:     Pascal Vilarem <maat>   07/04/04 13:55:46

Modified files:
        inc            : class.ged_ui.inc.php 

Log message:
        fix : default version in link to package_download

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25

Patches:
Index: class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.ged_ui.inc.php        3 Apr 2007 16:43:21 -0000       1.24
+++ class.ged_ui.inc.php        4 Apr 2007 13:55:46 -0000       1.25
@@ -321,7 +321,14 @@
                $element_id=get_var('element_id',array('GET','POST'));
                $version_id=get_var('version_id',array('GET','POST'));
                
+               if ( $version_id != '' )
                $theversion=$this->ged_dm->get_version_info($version_id);
+               else
+               {
+                       
$theversion=$this->ged_dm->get_current_or_alert_or_rejected_version($element_id);
+                       $version_id=$theversion['version_id'];
+               }
+                       
                $theversion_sterile_file_name = preg_replace( "/[^\w\.-]+/", 
"_", $theversion['name'] );
                
                
$thetempdir=$GLOBALS['phpgw_info']['server']['temp_dir']."/".$theversion_sterile_file_name;
@@ -567,9 +574,10 @@
                
                if ($list_relations_out !="")
                {
+                       $link_data=null;
                        $link_data['menuaction']='ged.ged_ui.package_download';
-                       $link_data['focused_id']=$element_id;
-                       $link_data['version_id']=$version_id;
+                       $link_data['element_id']=$current_version['element_id'];
+                       $link_data['version_id']=$current_version['version_id'];
                        $this->t->set_var('relation_link', 
$GLOBALS['phpgw']->link('/index.php', $link_data));
                        
                        $this->t->set_var('download_all_link', 
$GLOBALS['phpgw']->link('/index.php', $link_data));