Commit 8f6c41911a8e4d16b512e50efcf72c0e199db4e6
1 parent
d5bd5700
Fix "Unit folder are not shows as Unit if Description is modified"
problem. SF Tracker: 1224874 Submitted by: Nicolas Quienot (nquienot) git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3395 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
4 additions
and
3 deletions
lib/foldermanagement/Folder.inc
| @@ -686,10 +686,11 @@ class Folder extends KTEntity { | @@ -686,10 +686,11 @@ class Folder extends KTEntity { | ||
| 686 | */ | 686 | */ |
| 687 | function folderIsUnitRootFolder($iFolderID) { | 687 | function folderIsUnitRootFolder($iFolderID) { |
| 688 | global $default; | 688 | global $default; |
| 689 | - $sQuery = "SELECT F.id FROM $default->folders_table AS F " ./*ok*/ | ||
| 690 | - "INNER JOIN $default->units_table AS U ON F.name LIKE U.name " . | 689 | + $sQuery = "SELECT F.id FROM $default->folders_table AS F " . |
| 690 | + "INNER JOIN $default->folders_table AS P ON F.parent_id=P.id " . | ||
| 691 | + "INNER JOIN $default->units_table AS U ON F.unit_id=U.id " . | ||
| 691 | "WHERE F.id = ? " . | 692 | "WHERE F.id = ? " . |
| 692 | - "AND F.description LIKE '%Unit Root Folder'"; | 693 | + " AND P.unit_id<>F.unit_id "; |
| 693 | $aParams = array($iFolderID); | 694 | $aParams = array($iFolderID); |
| 694 | $sql = $default->db; | 695 | $sql = $default->db; |
| 695 | $sql->query(array($sQuery, $aParams)); | 696 | $sql->query(array($sQuery, $aParams)); |