Commit aba899cc835290a1b286d0d515b22179a31065f7
1 parent
34c2bcec
Fixed store problem
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@859 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
4 additions
and
5 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
| @@ -17,14 +17,14 @@ function getFolderPath($iFolderID) { | @@ -17,14 +17,14 @@ function getFolderPath($iFolderID) { | ||
| 17 | function getFolderData($iFolderID) { | 17 | function getFolderData($iFolderID) { |
| 18 | global $default; | 18 | global $default; |
| 19 | $sQuery = "SELECT F.id, F.name AS folder_name, F.description, F.document_type_id, DTL.name AS document_type_name, F.is_public " . | 19 | $sQuery = "SELECT F.id, F.name AS folder_name, F.description, F.document_type_id, DTL.name AS document_type_name, F.is_public " . |
| 20 | - "FROM $default->owl_folders_table AS F INNER JOIN $default->owl_document_types_table AS DTL ON F.document_type_id = DTL.ID " . | 20 | + "FROM $default->owl_folders_table AS F LEFT OUTER JOIN $default->owl_document_types_table AS DTL ON F.document_type_id = DTL.ID " . |
| 21 | "WHERE F.id = $iFolderID"; | 21 | "WHERE F.id = $iFolderID"; |
| 22 | 22 | ||
| 23 | $aDisplayColumns = array("folder_name", "description", "document_type_name", "is_public"); | 23 | $aDisplayColumns = array("folder_name", "description", "document_type_name", "is_public"); |
| 24 | - $aDisplayColumns = array("folder_name", "description" , "document_type_id", "is_public"); | 24 | + $aStoreColumns = array("name", "description" , "document_type_id", "is_public"); |
| 25 | $aColumnNames = array("Name", "Description", "Document type", "Public"); | 25 | $aColumnNames = array("Name", "Description", "Document type", "Public"); |
| 26 | $aDisplayColumnTypes = array(1,1,3,2); | 26 | $aDisplayColumnTypes = array(1,1,3,2); |
| 27 | - $aDatabaseColumnTypes = array(0,1,0,2); | 27 | + $aDatabaseColumnTypes = array(1,1,0,2); |
| 28 | $aDropDownListTableNames = array(2 => "$default->owl_document_types_table"); | 28 | $aDropDownListTableNames = array(2 => "$default->owl_document_types_table"); |
| 29 | 29 | ||
| 30 | $oPatternEditableListFromQuery = & new PatternEditableListFromQuery($sQuery, $default->owl_folders_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes); | 30 | $oPatternEditableListFromQuery = & new PatternEditableListFromQuery($sQuery, $default->owl_folders_table, $aDisplayColumns, $aStoreColumns, $aColumnNames, $aDisplayColumnTypes, $aDatabaseColumnTypes); |
| @@ -67,8 +67,7 @@ function getPage($iFolderID) { | @@ -67,8 +67,7 @@ function getPage($iFolderID) { | ||
| 67 | $sToRender .= "<td>" . wrapInTable(getFolderRouting($iFolderID)) . "</td>\n"; | 67 | $sToRender .= "<td>" . wrapInTable(getFolderRouting($iFolderID)) . "</td>\n"; |
| 68 | $sToRender .= "</tr>\n"; | 68 | $sToRender .= "</tr>\n"; |
| 69 | $sToRender .= "<tr>\n"; | 69 | $sToRender .= "<tr>\n"; |
| 70 | - $sToRender .= "<td><table><tr><td><a href=\"$default->owl_root_url/control.php?action=addFolderCollaboration&fFolderID=$iFolderID\"><img src=\"$default->owl_graphics_url/widgets/add.gif\" border=\"0\" /></a></td><td> </td></tr></table></td>\n"; | ||
| 71 | - $sToRender .= "</tr>\n"; | 70 | + $sToRender .= "<td><table><tr><td><input type=\"image\" src=\"$default->owl_graphics_url/widgets/update.gif\" border=\"0\" /></td><td><a href=\"$default->owl_root_url/control.php?action=addFolderCollaboration&fFolderID=$iFolderID\"><img src=\"$default->owl_graphics_url/widgets/add.gif\" border=\"0\" /></a></td></tr></table></td>\n"; $sToRender .= "</tr>\n"; |
| 72 | $sToRender .= "</table>\n"; | 71 | $sToRender .= "</table>\n"; |
| 73 | return $sToRender; | 72 | return $sToRender; |
| 74 | } | 73 | } |