Peter M. Groen / knowledgetree

Commit df47576be5ff7e42288cc9405247d632e3204f94

Authored by Michael Joseph
1 parent 0aadca66

(#2837) reinstated browse which adding a document 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2548 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 17 additions and 18 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentUI.inc
  View file @df47576
@@ -122,17 +122,16 @@ function getMetaDataForm($iFolderID, $iDocumentTypeID) { @@ -122,17 +122,16 @@ function getMetaDataForm($iFolderID, $iDocumentTypeID) {
122 $sToRender .= "//-->\n</script>\n\n"; 122 $sToRender .= "//-->\n</script>\n\n";
123 123
124 return $sToRender; 124 return $sToRender;
125 -} 125 +}
  126 +
126 function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sMessage = "") { 127 function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sMessage = "") {
127 global $default; 128 global $default;
128 129
129 - if (isset($iDependantDocumentID)) {  
130 - $sQueryString = "&fDependantDocumentID=$iDependantDocumentID";  
131 - } 130 + $sQueryString = "fFolderID=$iFolderID" . (isset($iDependantDocumentID) ? "&fDependantDocumentID=$iDependantDocumentID" : "");
132 131
133 $sToRender .= renderHeading("Add " . (isset($iDependantDocumentID) ? "Dependant " : "") . "Document"); 132 $sToRender .= renderHeading("Add " . (isset($iDependantDocumentID) ? "Dependant " : "") . "Document");
134 133
135 - $sToRender .= renderFolderPath($iFolderID, "/control.php?action=addDocument" . $sQueryString, (isset($iDependantDocumentID) ? true : false)); 134 + $sToRender .= renderFolderPath($iFolderID, generateControllerUrl("addDocument", $sQueryString, false), true);
136 135
137 if ($sMessage) { 136 if ($sMessage) {
138 $sToRender .= "<table border=\"0\" width=\"100%\">\n"; 137 $sToRender .= "<table border=\"0\" width=\"100%\">\n";
@@ -148,7 +147,7 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM @@ -148,7 +147,7 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM
148 $sToRender .= getMetaDataForm($iFolderID, $iDocumentTypeID); 147 $sToRender .= getMetaDataForm($iFolderID, $iDocumentTypeID);
149 $sActionButtons = "<input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/>"; 148 $sActionButtons = "<input type=\"image\" src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/>";
150 $sToRender .= "<input type=\"hidden\" name=\"fStore\" value=\"1\">"; 149 $sToRender .= "<input type=\"hidden\" name=\"fStore\" value=\"1\">";
151 - $sActionButtons .= generateControllerLink("addDocument", "fFolderID=$iFolderID" . $sQueryString , "<img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"/>") . 150 + $sActionButtons .= generateControllerLink("addDocument", $sQueryString , "<img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"/>") .
152 generateControllerLink("browse", "fFolderID=$iFolderID", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>"); 151 generateControllerLink("browse", "fFolderID=$iFolderID", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>");
153 152
154 $sToRender .= "<table border=\"0\" width=\"100%\" >\n"; 153 $sToRender .= "<table border=\"0\" width=\"100%\" >\n";
@@ -156,7 +155,7 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM @@ -156,7 +155,7 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM
156 $sToRender .= "</table>"; 155 $sToRender .= "</table>";
157 156
158 } else { 157 } else {
159 - // only allow document type choosing and display folder list if the user has write permission 158 + // only allow document type choosing if the user has write permission
160 if (Permission::userHasFolderWritePermission($iFolderID)) { 159 if (Permission::userHasFolderWritePermission($iFolderID)) {
161 $sToRender .= getDocumentType($iFolderID, $iDocumentTypeID, $iDependantDocumentID); 160 $sToRender .= getDocumentType($iFolderID, $iDocumentTypeID, $iDependantDocumentID);
162 $sActionButtons .= generateControllerLink("browse", "fFolderID=$iFolderID", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>"); 161 $sActionButtons .= generateControllerLink("browse", "fFolderID=$iFolderID", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/>");
@@ -164,16 +163,16 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM @@ -164,16 +163,16 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM
164 $sToRender .= "<table border=\"0\" width=\"100%\" >\n"; 163 $sToRender .= "<table border=\"0\" width=\"100%\" >\n";
165 $sToRender .= "<tr><td>$sActionButtons</td></tr>"; 164 $sToRender .= "<tr><td>$sActionButtons</td></tr>";
166 $sToRender .= "</table>"; 165 $sToRender .= "</table>";
167 -  
168 - // display folders for browsing  
169 - $sToRender .= "<table border=\"0\" width=\"100%\">\n";  
170 - $sToRender .= "<tr>\n";  
171 - $sToRender .= "\t<td>" . renderFolderList($iFolderID, "/control.php?action=addDocument" . $sQueryString) . "<td>\n";  
172 - $sToRender .= "</tr>\n";  
173 - $sToRender .= "<tr>\n";  
174 - $sToRender .= "</tr>";  
175 - $sToRender .= "</table><br>\n";  
176 - } 166 + }
  167 + // display folders for browsing
  168 + $sToRender .= "<table border=\"0\" width=\"100%\">\n";
  169 + $sToRender .= "<tr>\n";
  170 + $sToRender .= "\t<td>" . renderFolderList($iFolderID, generateControllerUrl("addDocument", $sQueryString, false)) . "<td>\n";
  171 + $sToRender .= "</tr>\n";
  172 + $sToRender .= "<tr>\n";
  173 + $sToRender .= "</tr>";
  174 + $sToRender .= "</table><br>\n";
  175 +
177 } 176 }
178 177
179 return $sToRender; 178 return $sToRender;
@@ -181,7 +180,7 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM @@ -181,7 +180,7 @@ function getPage($iFolderID, $iDocumentTypeID, $iDependantDocumentID = null, $sM
181 180
182 function getStatusPage($iFolderID, $sMessage) { 181 function getStatusPage($iFolderID, $sMessage) {
183 $sToRender .= renderHeading("Add Document"); 182 $sToRender .= renderHeading("Add Document");
184 - $sToRender .= renderFolderPath($iFolderID, "", false); 183 + $sToRender .= renderFolderPath($iFolderID, generateControllerUrl("addDocument", "fFolderID=$iFolderID"), true);
185 184
186 $sToRender .= "<table border=\"0\" width=\"100%\">\n"; 185 $sToRender .= "<table border=\"0\" width=\"100%\">\n";
187 $sToRender .= "<tr>\n"; 186 $sToRender .= "<tr>\n";