Peter M. Groen / knowledgetree

Commit a525f20583ef344a63857bde4e4bf39ec002f470

Authored by michael
1 parent c6850f99

fixed metadata prefilling and validation 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1448 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
lib/visualpatterns/PatternEditableTableSqlQuery.inc
  View file @a525f20
... ... @@ -104,7 +104,6 @@ class PatternEditableTableSqlQuery {
104 104 }
105 105 $sql = $default->db;
106 106 $sql->query($this->sQuery);
107   -
108 107 if ($sql->num_rows() == 0) {
109 108 $sToRender .= "<tr>\n";
110 109 $sToRender .= "<td colspan=" . count($this->aColumnsSql) . ">No " . (isset($this->sTableCaption) ? $this->sTableCaption : "") . " data</td>\n";
... ... @@ -121,7 +120,7 @@ class PatternEditableTableSqlQuery {
121 120 if (isset($this->aRequiredColumnNames)) {
122 121 for ($k = 0; $k < count($this->aRequiredColumnNames); $k++) {
123 122 if (strcmp($this->aStoreColumnNames[$i], $this->aRequiredColumnNames[$k]) == 0) {
124   - $aRequiredVariables[count($aRequiredVariables)]["formName"] = $this->sUniqueName . "_" . $iRowCount . $i . "_value";
  123 + $aRequiredVariables[count($aRequiredVariables)]["formName"] = $this->sUniqueName . "_" . $iRowCount . $i . "_value";
125 124 }
126 125 }
127 126 }
... ... @@ -174,7 +173,7 @@ class PatternEditableTableSqlQuery {
174 173 $sToRender .= "\t<input type=\"hidden\" name=\"" . $this->sUniqueName . "_" . $iRowCount . $i . "_type\" value=\"" . $this->aColumnDatabaseTypes[$i] . "\" />\n";
175 174 if ($this->aColumnsVisible[$i]) {
176 175 if ($this->aColumnsEditable[$i]) {
177   - $oPattern = & new PatternMetaData($sql->f($this->aMetaDataFields[$i]), $this->sUniqueName . "_" . $iRowCount . $i . "_value", $sql->f($this->aStoreColumns[$i]));
  176 + $oPattern = & new PatternMetaData($sql->f($this->aMetaDataFields[$i]), $this->sUniqueName . "_" . $iRowCount . $i . "_value", $sql->f($this->aStoreColumnNames[$i]));
178 177 $sToRender .= $oPattern->render();
179 178 } else {
180 179 $sToRender .= "\t<input type=\"hidden\" name=\"" . $this->sUniqueName . "_" . $iRowCount . $i . "_value\" value=\"" . $sql->f($this->aStoreColumnNames[$i]) . "\" />".$sql->f($this->aDisplayColumnNames[$i])."\n";
... ... @@ -208,8 +207,8 @@ class PatternEditableTableSqlQuery {
208 207 $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
209 208 $sToRender .= "function validateForm(theForm) {\n";
210 209 for ($i = 0; $i < count($aValidationColumnNames); $i++) {
211   - $sToRender .= "\tif (!(validRequired(document.MainForm." . $aValidationColumnNames[$i]["formName"] . ", 'selected'))) {\n";
212   - $sToRender .= "\t\treturn false;\n\t}\n";
  210 + $sToRender .= "\tif (!(validRequired(document.MainForm." . $aValidationColumnNames[$i]["formName"] . ", 'selected'))) {\n";
  211 + $sToRender .= "\t\treturn false;\n\t}\n";
213 212 }
214 213 $sToRender .= "return true;\n}\n";
215 214  
... ...