Peter M. Groen / knowledgetree

Commit 73ae134debefd92391cc4bad8342fe85d2c4f3fb

Authored by rob
1 parent a334bb2a

Corrected table name 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@588 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc
  View file @73ae134
@@ -48,7 +48,7 @@ function renderEditableGenericMetaData($oDocument) { @@ -48,7 +48,7 @@ function renderEditableGenericMetaData($oDocument) {
48 $aColumnDatabaseTypes = array(0,0,1); 48 $aColumnDatabaseTypes = array(0,0,1);
49 49
50 50
51 - $oPatternTableSqlQuery = & new PatternEditableTableSqlQuery($sQuery, "document_fields_links", $aStoreColumnNames, $aDisplayColumnNames, $aColumnsEditable, $aColumnsVisible, $aColumnDisplayTypes, $aColumnDatabaseTypes); 51 + $oPatternTableSqlQuery = & new PatternEditableTableSqlQuery($sQuery, "document_fields_link", $aStoreColumnNames, $aDisplayColumnNames, $aColumnsEditable, $aColumnsVisible, $aColumnDisplayTypes, $aColumnDatabaseTypes);
52 $oPatternTableSqlQuery->setTableCaption("Generic Meta Data"); 52 $oPatternTableSqlQuery->setTableCaption("Generic Meta Data");
53 $oPatternTableSqlQuery->setUniqueName("gmd"); 53 $oPatternTableSqlQuery->setUniqueName("gmd");
54 return $oPatternTableSqlQuery->render(); 54 return $oPatternTableSqlQuery->render();
@@ -57,7 +57,7 @@ function renderEditableGenericMetaData($oDocument) { @@ -57,7 +57,7 @@ function renderEditableGenericMetaData($oDocument) {
57 57
58 function renderEditableTypeSpecificMetaData($oDocument) { 58 function renderEditableTypeSpecificMetaData($oDocument) {
59 global $default; 59 global $default;
60 - $sQuery = "SELECT COALESCE(DFL.id, -1) AS id, " . $oDocument->getID() . " AS document_id, DTFL.document_type_id AS document_type_id, DTL.name AS document_type_name, DTFL.field_id, DF.name AS field_name, DFL.value AS field_value, DTFL.is_mandatory AS is_mandatory " . 60 + $sQuery = "SELECT COALESCE(DFL.id, -1) AS id, " . $oDocument->getID() . " AS document_id, DTFL.document_type_id AS document_type_id, DTL.name AS document_type_name, DTFL.field_id AS document_field_id, DF.name AS field_name, DFL.value AS value, DTFL.is_mandatory AS is_mandatory " .
61 "FROM $default->owl_document_type_fields_table AS DTFL INNER JOIN $default->owl_folders_table AS F ON F.document_type_id = DTFL.document_type_id " . 61 "FROM $default->owl_document_type_fields_table AS DTFL INNER JOIN $default->owl_folders_table AS F ON F.document_type_id = DTFL.document_type_id " .
62 "INNER JOIN $default->owl_documents_table AS D ON D.folder_id = F.id " . 62 "INNER JOIN $default->owl_documents_table AS D ON D.folder_id = F.id " .
63 "INNER JOIN $default->owl_document_types_table AS DTL ON DTL.id = DTFL.document_type_id " . 63 "INNER JOIN $default->owl_document_types_table AS DTL ON DTL.id = DTFL.document_type_id " .
@@ -66,14 +66,14 @@ function renderEditableTypeSpecificMetaData($oDocument) { @@ -66,14 +66,14 @@ function renderEditableTypeSpecificMetaData($oDocument) {
66 "WHERE D.id = " . $oDocument->getID() . " " . 66 "WHERE D.id = " . $oDocument->getID() . " " .
67 "AND DF.is_generic = 0 "; 67 "AND DF.is_generic = 0 ";
68 68
69 - $aStoreColumnNames = array("document_id", "field_id", "field_value");  
70 - $aDisplayColumnNames = array("document_id", "field_name", "field_value"); 69 + $aStoreColumnNames = array("document_id", "document_field_id", "value");
  70 + $aDisplayColumnNames = array("document_id", "field_name", "value");
71 $aColumnsEditable = array(0,0,1); 71 $aColumnsEditable = array(0,0,1);
72 $aColumnsVisible = array(0,1,1); 72 $aColumnsVisible = array(0,1,1);
73 $aColumnDisplayTypes = array(1,1,1); 73 $aColumnDisplayTypes = array(1,1,1);
74 $aColumnDatabaseTypes = array(0,0,1); 74 $aColumnDatabaseTypes = array(0,0,1);
75 75
76 - $oPatternTableSqlQuery = & new PatternEditableTableSqlQuery($sQuery, "document_fields_links", $aStoreColumnNames, $aDisplayColumnNames, $aColumnsEditable, $aColumnsVisible, $aColumnDisplayTypes, $aColumnDatabaseTypes); 76 + $oPatternTableSqlQuery = & new PatternEditableTableSqlQuery($sQuery, "document_fields_link", $aStoreColumnNames, $aDisplayColumnNames, $aColumnsEditable, $aColumnsVisible, $aColumnDisplayTypes, $aColumnDatabaseTypes);
77 $oPatternTableSqlQuery->setTableCaption("Type specific meta data"); 77 $oPatternTableSqlQuery->setTableCaption("Type specific meta data");
78 $oPatternTableSqlQuery->setUniqueName("tsmd"); 78 $oPatternTableSqlQuery->setUniqueName("tsmd");
79 return $oPatternTableSqlQuery->render(); 79 return $oPatternTableSqlQuery->render();