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

[Pascal Vilarem]

CVSROOT:        /sources/phpgroupware
Module name:    ged
Changes by:     Pascal Vilarem <maat>   07/07/16 13:06:58

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

Log message:
        Fix : Set up project root correctly when adding a new folder

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34

Patches:
Index: class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.ged_dm.inc.php        16 Jul 2007 12:41:08 -0000      1.31
+++ class.ged_dm.inc.php        16 Jul 2007 13:06:57 -0000      1.32
@@ -581,10 +581,10 @@
                }
                else
                {
-                       $sql_model="INSERT INTO %s ( type, parent_id, name, 
reference, description, owner_id, creator_id, creation_date ) VALUES ";
-                       $sql_model.=" ( '%s', %d, '%s', '%s', '%s', %d, %d, %d) 
";
+                       $sql_model="INSERT INTO %s ( type, parent_id, name, 
reference, description, owner_id, creator_id, creation_date, project_name ) 
VALUES ";
+                       $sql_model.=" ( '%s', %d, '%s', '%s', '%s', %d, %d, %d, 
'%s') ";
 
-                       $sql=sprintf($sql_model, $this->tables['elements'], 
'folder', $new_folder['parent_id'], $new_folder['name'], 
$new_folder['referenceq'], $new_folder['description'], 
$GLOBALS['phpgw_info']['user']['account_id'], 
$GLOBALS['phpgw_info']['user']['account_id'], time());
+                       $sql=sprintf($sql_model, $this->tables['elements'], 
'folder', $new_folder['parent_id'], $new_folder['name'], 
$new_folder['referenceq'], $new_folder['description'], 
$GLOBALS['phpgw_info']['user']['account_id'], 
$GLOBALS['phpgw_info']['user']['account_id'], 
time(),$new_folder['project_name']);
                        
                        if ( $new_folder['project_name']!='')
                        {
@@ -602,7 +602,7 @@
                
                if ( $set_project )
                {
-                       $this->set_project($new_element_id, 
$new_element_id['project_name']);
+                       $this->set_project($new_element_id, 
$new_folder['project_name']);
                }
                
                //TODO positionnement des droits.

Index: class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.ged_ui.inc.php        16 Jul 2007 12:41:08 -0000      1.33
+++ class.ged_ui.inc.php        16 Jul 2007 13:06:57 -0000      1.34
@@ -180,6 +180,8 @@
                $this->t->set_var('major_field', 'major');
                $this->t->set_var('minor_field','minor');
                
+               $this->t->set_var('project_name_field', 'project_name');
+               
 
                $this->t->set_var('lang_version', lang('Version'));
                $this->t->set_var('lang_version_creation_date', lang('creation 
date'));