[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged/inc class.ged_ui.inc.php class.ged_dm.inc.php
From: |
Pascal Vilarem |
Subject: |
[Phpgroupware-cvs] ged/inc class.ged_ui.inc.php class.ged_dm.inc.php |
Date: |
Wed, 28 Mar 2007 15:24:23 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/03/28 15:24:23
Modified files:
inc : class.ged_ui.inc.php class.ged_dm.inc.php
Log message:
fix : now we can remove the last relation
add : now we can ling to pending documents
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_ui.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/ged/inc/class.ged_dm.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
Patches:
Index: class.ged_ui.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_ui.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.ged_ui.inc.php 28 Mar 2007 14:52:35 -0000 1.20
+++ class.ged_ui.inc.php 28 Mar 2007 15:24:22 -0000 1.21
@@ -1199,6 +1199,8 @@
{
$amended_version['relations']=$relations;
}
+ else
+ $amended_version['relations']=null;
$amended_version['description']=$version_description;
$amended_version['version_id']=$version_id;
@@ -1274,7 +1276,7 @@
$search_results=$this->ged_dm->search($query);
}
- if ( is_array($relations))
+ if ( is_array($relations) || $search=="search" ||
$do_add_relation != '' || $do_remove_relation != '' )
{
// TODO : Enrichir un peu pour afficher plus
d'infos'
$i=0;
Index: class.ged_dm.inc.php
===================================================================
RCS file: /sources/phpgroupware/ged/inc/class.ged_dm.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.ged_dm.inc.php 28 Mar 2007 14:28:56 -0000 1.15
+++ class.ged_dm.inc.php 28 Mar 2007 15:24:22 -0000 1.16
@@ -493,6 +493,12 @@
}
}
}
+ else
+ {
+ $sql="DELETE FROM
".$this->tables['relations']." where
linking_version_id=".$amended_version['version_id'];
+ $this->db->query($sql, __LINE__, __FILE__);
+ $this->db->unlock();
+ }
}
return "OK";
@@ -2191,7 +2197,8 @@
$sql.="FROM ( ged_elements ";
$sql.="INNER JOIN ged_versions as ged_current_version ";
$sql.="ON
ged_elements.element_id=ged_current_version.element_id ";
- $sql.="AND ( ged_current_version.status='current' or
ged_current_version.status='working' )) ";
+ $sql.="AND ( ged_current_version.status='current' OR
ged_current_version.status='working' OR
ged_current_version.status='pending_for_technical_review' ";
+ $sql.="OR
ged_current_version.status='pending_for_quality_review' OR
ged_current_version.status='ready_for_delivery' OR
ged_current_version.status='pending_for_approval' )) ";
$sql.="WHERE ged_elements.name like '%".$query."%' OR
ged_elements.description like '%".$query."%' OR ged_elements.reference like
'%".$query."%' ";
$sql.="OR ged_current_version.description like
'%".$query."%';";