[Phpgroupware-cvs] projects/inc class.uiprojects_base.inc.php, 1.12 class.uiprojects.inc.php, 1.159 class.attached_files.inc.php, 1.3

[ceb]

Update of projects/inc

Modified Files:
     Branch: MAIN
            class.uiprojects_base.inc.php lines: +3 -2
            class.uiprojects.inc.php lines: +7 -15
Removed Files:
     Branch: MAIN
            class.attached_files.inc.php

Log Message:
update attached files

====================================================
Index: projects/inc/class.uiprojects_base.inc.php
diff -u projects/inc/class.uiprojects_base.inc.php:1.11 
projects/inc/class.uiprojects_base.inc.php:1.12
--- projects/inc/class.uiprojects_base.inc.php:1.11     Fri Apr  8 15:52:58 2005
+++ projects/inc/class.uiprojects_base.inc.php  Sun Apr 10 22:40:36 2005
@@ -968,6 +968,7 @@
                        
$GLOBALS['phpgw']->template->set_var('lang_billable',lang('billable'));
                        
$GLOBALS['phpgw']->template->set_var('lang_files',lang('files'));
                        
$GLOBALS['phpgw']->template->set_var('lang_attach',lang('attach file'));
+
                        
$GLOBALS['phpgw']->template->set_var('lang_plan_bottom_up',lang('plan bottom 
up'));
                        
$GLOBALS['phpgw']->template->set_var('lang_direct_work',lang('direct work'));
                        
$GLOBALS['phpgw']->template->set_var('lang_sum',lang('Sum'));

====================================================
Index: projects/inc/class.uiprojects.inc.php
diff -u projects/inc/class.uiprojects.inc.php:1.158 
projects/inc/class.uiprojects.inc.php:1.159
--- projects/inc/class.uiprojects.inc.php:1.158 Fri Apr  8 15:52:58 2005
+++ projects/inc/class.uiprojects.inc.php       Sun Apr 10 22:40:36 2005
@@ -48,7 +48,7 @@
                        $this->boprojects                               = 
$this->ui_base->boprojects;
                        $this->nextmatchs                               = 
CreateObject('phpgwapi.nextmatchs');

-                       //$this->attached_files                 = 
CreateObject('projects.attached_files');
+                       $this->attached_files                   = 
CreateObject('filemanager.uiactions');

                        $this->start                                    = 
$this->boprojects->start;
                        $this->query                                    = 
$this->boprojects->query;
@@ -408,8 +408,6 @@
                                
$GLOBALS['phpgw']->template->set_var('customer_main',$main['customerout']);
                                
$GLOBALS['phpgw']->template->set_var('customer_org_name',$main['customerorgout']);
                                
$GLOBALS['phpgw']->template->set_var('url_main',$main['url']);
-                               
$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($pro_main));
-                               
$GLOBALS['phpgw']->template->set_var('lang_files',lang('Files'));
                                $link = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.report&project_id='
 . $pro_main . '&generated=1');
                                
$GLOBALS['phpgw']->template->set_var('report','<a href="' . $link . '"><img 
src="projects/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . 
'/images/document.png" title="' . lang('generate activity report') . '">' . 
lang('generate activity report') . '</a>');
                                
$GLOBALS['phpgw']->template->parse('main','project_main',True);
@@ -658,7 +656,6 @@
 // ---------------- list header variable template-declarations 
--------------------------

                        
$this->t->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'p_number',$this->order,'/index.php',lang('Project
 ID'),$link_data));
-                       $this->t->set_var('lang_milestones',lang('milestones'));
                        
$this->t->set_var('sort_title',$this->nextmatchs->show_sort_order($this->sort,'title',$this->order,'/index.php',lang('Title'),$link_data));
                        
$this->t->set_var('sort_end_date',$this->nextmatchs->show_sort_order($this->sort,'end_date',$this->order,'/index.php',lang('Date
 due'),$link_data));
                        
$this->t->set_var('sort_coordinator',$this->nextmatchs->show_sort_order($this->sort,'coordinator',$this->order,'/index.php',lang('Coordinator'),$link_data));
@@ -860,7 +857,7 @@
                                else
                                {
                                        $project_id = 
$this->boprojects->save_project($action, $values);
-                                       
//$this->attached_files->save_file($project_id);
+                                       
$this->attached_files->save_file($project_id);
                                        $link_data['project_id'] = $project_id;
                                        if($_POST['save'])
                                        {
@@ -1361,9 +1358,7 @@
                        
$GLOBALS['phpgw']->template->set_var('test',$values['test']);
                        
$GLOBALS['phpgw']->template->set_var('quality',$values['quality']);

-                       
//$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id,
 True));
-                       
$GLOBALS['phpgw']->template->set_var('lang_files',lang('Files'));
-                       
$GLOBALS['phpgw']->template->set_var('lang_attach',lang('Attach File'));
+                       
$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id,
 True));

 //--------- coordinator -------------

@@ -1437,8 +1432,6 @@
                        
$GLOBALS['phpgw']->template->set_var('customer_org_name', $customer_org_name);
                        $GLOBALS['phpgw']->template->set_var('customer_org', 
$customer_org_id);

-                       
//$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id,True));
-
                        if ($project_id && 
$this->boprojects->edit_perms(array('action' => $action,'coordinator' => 
$values['coordinator'],'main_co' => $main['coordinator'],
                                                                                
                        'parent_co' => $parent['coordinator'],'type' => 
'delete')))
                        {
@@ -1602,6 +1595,8 @@
                        
$GLOBALS['phpgw']->template->set_var('udate',$values['udate_formatted']);
                        
$GLOBALS['phpgw']->template->set_var('cdate',$values['cdate_formatted']);

+                       
$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id));
+
 //--------- coordinator -------------

                        
$GLOBALS['phpgw']->template->set_var('lang_coordinator',lang('Coordinator'));
@@ -1617,7 +1612,6 @@

 // --------- milestones ------------------------------

-                       
$GLOBALS['phpgw']->template->set_var('lang_milestones',lang('milestones').':');
                        $mstones = $this->boprojects->get_mstones($project_id);
                        //$link_data['menuaction'] = 
'projects.uiprojects.edit_mstone';

@@ -1717,8 +1711,6 @@
                                        'location'   => 'projects_view',
                                        'project_id' => $project_id
                                ));*/
-
-                       
//$GLOBALS['phpgw']->template->set_var('attachment',$this->attached_files->get_files($project_id));

                        $GLOBALS['phpgw']->template->set_var('ownhandle','');
                        $GLOBALS['phpgw']->template->set_var('acthandle','');