Commit bd2d92dfabf4accc73bc6c6800b9d94c48f6c2ac

Authored by Michael Joseph
1 parent 51231057

corrected displaying checkbox condition


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2343 c91229c3-7414-0410-bfa2-8a42b809f60b
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
@@ -18,7 +18,7 @@ function getEditPage($iDocFieldID) { @@ -18,7 +18,7 @@ function getEditPage($iDocFieldID) {
18 $aDataTypes = $oDocField->getAllDataTypes(); 18 $aDataTypes = $oDocField->getAllDataTypes();
19 $currentDataType = $oDocField->getDataType(); 19 $currentDataType = $oDocField->getDataType();
20 } 20 }
21 - 21 +
22 $sToRender .= renderHeading("Edit Document Field"); 22 $sToRender .= renderHeading("Edit Document Field");
23 $sToRender .= "<table>\n"; 23 $sToRender .= "<table>\n";
24 $sToRender .= "<tr></tr>\n"; 24 $sToRender .= "<tr></tr>\n";
@@ -28,7 +28,7 @@ function getEditPage($iDocFieldID) { @@ -28,7 +28,7 @@ function getEditPage($iDocFieldID) {
28 $sToRender .= "<tr>\n"; 28 $sToRender .= "<tr>\n";
29 $sToRender .= "</tr>\n"; 29 $sToRender .= "</tr>\n";
30 $sToRender .= "<tr>\n"; 30 $sToRender .= "<tr>\n";
31 - 31 +
32 // if a DocField selected...show checkboxes 32 // if a DocField selected...show checkboxes
33 if (isset($iDocFieldID)) { 33 if (isset($iDocFieldID)) {
34 $sToRender .= "</tr>\n"; 34 $sToRender .= "</tr>\n";
@@ -36,15 +36,15 @@ function getEditPage($iDocFieldID) { @@ -36,15 +36,15 @@ function getEditPage($iDocFieldID) {
36 $sToRender .= "<td>Data Type: </td><td>" . getDataTypesList($aDataTypes, $currentDataType ) . "</td>\n"; 36 $sToRender .= "<td>Data Type: </td><td>" . getDataTypesList($aDataTypes, $currentDataType ) . "</td>\n";
37 $sToRender .= "</tr>\n"; 37 $sToRender .= "</tr>\n";
38 $sToRender .= "<tr>\n"; 38 $sToRender .= "<tr>\n";
39 -  
40 - // allow changing the generic status if the field is not linked to a document type  
41 - // and if this isn't the category field  
42 - if ( ($checkBox == false) || $oDocField->getName() != "Category") { 39 +
  40 + // allow changing the generic status if the field is not linked to a document type
  41 + // and if this isn't the category field
  42 + if ( ($checkBox == false) && $oDocField->getName() != "Category") {
43 $sToRender .= "<td>Is Generic: </td><td>" . getIsGenericCheckBox($oDocField) . "</td>\n"; 43 $sToRender .= "<td>Is Generic: </td><td>" . getIsGenericCheckBox($oDocField) . "</td>\n";
44 } else { 44 } else {
45 $sToRender .= "<input type=\"hidden\" name=\"fDocFieldIsGeneric\" value=\"" . $oDocField->getIsGeneric() . "\">\n"; 45 $sToRender .= "<input type=\"hidden\" name=\"fDocFieldIsGeneric\" value=\"" . $oDocField->getIsGeneric() . "\">\n";
46 } 46 }
47 - 47 +
48 $sToRender .= "</tr>\n"; 48 $sToRender .= "</tr>\n";
49 $sToRender .= "<tr>\n"; 49 $sToRender .= "<tr>\n";
50 $sToRender .= "<td>Has MetaData Lookup: </td><td>" . getHasLookupCheckBox($oDocField) . "</td>\n"; 50 $sToRender .= "<td>Has MetaData Lookup: </td><td>" . getHasLookupCheckBox($oDocField) . "</td>\n";
@@ -52,21 +52,21 @@ function getEditPage($iDocFieldID) { @@ -52,21 +52,21 @@ function getEditPage($iDocFieldID) {
52 $sToRender .= "<tr>\n"; 52 $sToRender .= "<tr>\n";
53 $sToRender .= "</tr>\n"; 53 $sToRender .= "</tr>\n";
54 } 54 }
55 -  
56 - 55 +
  56 +
57 $sToRender .= "<tr>\n"; 57 $sToRender .= "<tr>\n";
58 $sToRender .= "</tr>\n"; 58 $sToRender .= "</tr>\n";
59 $sToRender .= "<td></td>" . getUpdateButton($oDocField); 59 $sToRender .= "<td></td>" . getUpdateButton($oDocField);
60 $sToRender .= getCancelButton($oDocField); 60 $sToRender .= getCancelButton($oDocField);
61 $sToRender .= "</table>\n"; 61 $sToRender .= "</table>\n";
62 -  
63 - $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";  
64 - $sToRender .= "function validateForm(theForm) {\n";  
65 - $sToRender .= "\tif (!(validRequired(theForm.fDocFieldName, 'Document Field Name'))) {\n";  
66 - $sToRender .= "\t\treturn false;\n";  
67 - $sToRender .= "\t}\n";  
68 - $sToRender .= "return true;\n}\n";  
69 - $sToRender .= "//-->\n</script>\n\n"; 62 +
  63 + $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
  64 + $sToRender .= "function validateForm(theForm) {\n";
  65 + $sToRender .= "\tif (!(validRequired(theForm.fDocFieldName, 'Document Field Name'))) {\n";
  66 + $sToRender .= "\t\treturn false;\n";
  67 + $sToRender .= "\t}\n";
  68 + $sToRender .= "return true;\n}\n";
  69 + $sToRender .= "//-->\n</script>\n\n";
70 70
71 return $sToRender; 71 return $sToRender;
72 } 72 }
@@ -74,7 +74,7 @@ function getEditPage($iDocFieldID) { @@ -74,7 +74,7 @@ function getEditPage($iDocFieldID) {
74 // if edition is successful print otu success page 74 // if edition is successful print otu success page
75 function getEditPageSuccess() { 75 function getEditPageSuccess() {
76 global $default; 76 global $default;
77 - 77 +
78 $sToRender .= renderHeading("Edit Document Field"); 78 $sToRender .= renderHeading("Edit Document Field");
79 $sToRender .= "<b>Success!</b>\n"; 79 $sToRender .= "<b>Success!</b>\n";
80 $sToRender .= "<table>\n"; 80 $sToRender .= "<table>\n";
@@ -87,7 +87,7 @@ function getEditPageSuccess() { @@ -87,7 +87,7 @@ function getEditPageSuccess() {
87 $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n"; 87 $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
88 $sToRender .= "</tr>\n"; 88 $sToRender .= "</tr>\n";
89 $sToRender .= "</table>\n"; 89 $sToRender .= "</table>\n";
90 - 90 +
91 return $sToRender; 91 return $sToRender;
92 } 92 }
93 93
@@ -95,7 +95,7 @@ function getEditPageSuccess() { @@ -95,7 +95,7 @@ function getEditPageSuccess() {
95 // gets the page if edition fails 95 // gets the page if edition fails
96 function getEditPageFail() { 96 function getEditPageFail() {
97 global $default; 97 global $default;
98 - 98 +
99 $sToRender .= renderHeading("Edit Document Field"); 99 $sToRender .= renderHeading("Edit Document Field");
100 $sToRender .= "<b>FAILURE!</b>\n"; 100 $sToRender .= "<b>FAILURE!</b>\n";
101 $sToRender .= "<table>\n"; 101 $sToRender .= "<table>\n";
@@ -108,7 +108,7 @@ function getEditPageFail() { @@ -108,7 +108,7 @@ function getEditPageFail() {
108 $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n"; 108 $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
109 $sToRender .= "</tr>\n"; 109 $sToRender .= "</tr>\n";
110 $sToRender .= "</table>\n"; 110 $sToRender .= "</table>\n";
111 - 111 +
112 return $sToRender; 112 return $sToRender;
113 } 113 }
114 114
@@ -122,19 +122,19 @@ function getDocFieldDisplay($oDocField) { @@ -122,19 +122,19 @@ function getDocFieldDisplay($oDocField) {
122 return $oPatternListBox->render(); 122 return $oPatternListBox->render();
123 } else { 123 } else {
124 return "<input type=\"hidden\" name=\"fDocFieldID\" value=\"" . $oDocField->iId . "\">\n" . 124 return "<input type=\"hidden\" name=\"fDocFieldID\" value=\"" . $oDocField->iId . "\">\n" .
125 - "<input size=\"40\" type=\"text\" name=\"fDocFieldName\" value=\"" . $oDocField->getName() . "\"" .  
126 - ($oDocField->getName() == "Category" ? "disabled=\"disabled\"" : "") . ">"; 125 + "<input size=\"40\" type=\"text\" name=\"fDocFieldName\" value=\"" . $oDocField->getName() . "\"" .
  126 + ($oDocField->getName() == "Category" ? "disabled=\"disabled\"" : "") . ">";
127 } 127 }
128 } 128 }
129 129
130 // show Group details on confirm deletion page 130 // show Group details on confirm deletion page
131 function getDataTypesList($aDataTypes, $sCurrent) { 131 function getDataTypesList($aDataTypes, $sCurrent) {
132 global $default; 132 global $default;
133 - 133 +
134 $sDataype = "<Select Name=\"fDocFieldDataType\">"; 134 $sDataype = "<Select Name=\"fDocFieldDataType\">";
135 - 135 +
136 for ($i=0;$i < count($aDataTypes);$i++) { 136 for ($i=0;$i < count($aDataTypes);$i++) {
137 - 137 +
138 if($aDataTypes[$i]["name"] == $sCurrent) { 138 if($aDataTypes[$i]["name"] == $sCurrent) {
139 $Options .= "<OPTION value= \"". $aDataTypes[$i]["name"]. "\" SELECTED>". $aDataTypes[$i]["name"] ."</OPTION>\n"; 139 $Options .= "<OPTION value= \"". $aDataTypes[$i]["name"]. "\" SELECTED>". $aDataTypes[$i]["name"] ."</OPTION>\n";
140 } else { 140 } else {
@@ -163,7 +163,7 @@ function getHasLookupCheckBox($oDocField) { @@ -163,7 +163,7 @@ function getHasLookupCheckBox($oDocField) {
163 } else { 163 } else {
164 return "<input type=\"checkbox\" name=\"fDocFieldHasLookup\" " . ($oDocField->getHasLookup() ? "CHECKED " : " ") . " />"; 164 return "<input type=\"checkbox\" name=\"fDocFieldHasLookup\" " . ($oDocField->getHasLookup() ? "CHECKED " : " ") . " />";
165 } 165 }
166 - 166 +
167 } 167 }
168 168
169 // gets the updatebutton when a DocField is selected 169 // gets the updatebutton when a DocField is selected