Peter M. Groen / knowledgetree

Commit 497d8d873ae9a5a74f682fb0c60a0596bb4a37d2

Authored by omar
1 parent 7e6833ee

Back and Cancel buttons navigation logic fixed 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2151 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 6 changed files with 27 additions and 27 deletions
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataBL.php
  View file @497d8d8
@@ -38,12 +38,12 @@ if (checkSession()) { @@ -38,12 +38,12 @@ if (checkSession()) {
38 if($fMetaDataName != "") { 38 if($fMetaDataName != "") {
39 $oMetaData = new MetaData($fDocFieldID,$fMetaDataName); 39 $oMetaData = new MetaData($fDocFieldID,$fMetaDataName);
40 if($oMetaData->create()) { 40 if($oMetaData->create()) {
41 - $oPatternCustom->setHtml(getSuccessPage()); 41 + $oPatternCustom->setHtml(getSuccessPage($fDocFieldID));
42 } else { 42 } else {
43 - $oPatternCustom->setHtml(getFailPage()); 43 + $oPatternCustom->setHtml(getFailPage($fDocFieldID));
44 } 44 }
45 } else { 45 } else {
46 - $oPatternCustom->setHtml(getTextPage()); 46 + $oPatternCustom->setHtml(getTextPage($fDocFieldID));
47 } 47 }
48 } 48 }
49 49
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc
  View file @497d8d8
@@ -65,7 +65,7 @@ function getAddMetaDataPage($iDocFieldID) { @@ -65,7 +65,7 @@ function getAddMetaDataPage($iDocFieldID) {
65 65
66 66
67 // if edition is successful print otu success page 67 // if edition is successful print otu success page
68 -function getSuccessPage() { 68 +function getSuccessPage($iDocFieldID = null) {
69 global $default; 69 global $default;
70 70
71 $sToRender .= renderHeading("Add Document Field Lookup"); 71 $sToRender .= renderHeading("Add Document Field Lookup");
@@ -75,7 +75,7 @@ function getSuccessPage() { @@ -75,7 +75,7 @@ function getSuccessPage() {
75 $sToRender .= "<tr></tr>\n"; 75 $sToRender .= "<tr></tr>\n";
76 $sToRender .= "<tr></tr>\n"; 76 $sToRender .= "<tr></tr>\n";
77 $sToRender .= "<tr>\n"; 77 $sToRender .= "<tr>\n";
78 - $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"; 78 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
79 $sToRender .= "</tr>\n"; 79 $sToRender .= "</tr>\n";
80 $sToRender .= "</table>\n"; 80 $sToRender .= "</table>\n";
81 81
@@ -83,7 +83,7 @@ function getSuccessPage() { @@ -83,7 +83,7 @@ function getSuccessPage() {
83 } 83 }
84 84
85 // if edition is successful print otu success page 85 // if edition is successful print otu success page
86 -function getFailPage() { 86 +function getFailPage($iDocFieldID = null) {
87 global $default; 87 global $default;
88 88
89 $sToRender .= renderHeading("Add Document Field Lookup"); 89 $sToRender .= renderHeading("Add Document Field Lookup");
@@ -93,7 +93,7 @@ function getFailPage() { @@ -93,7 +93,7 @@ function getFailPage() {
93 $sToRender .= "<tr></tr>\n"; 93 $sToRender .= "<tr></tr>\n";
94 $sToRender .= "<tr></tr>\n"; 94 $sToRender .= "<tr></tr>\n";
95 $sToRender .= "<tr>\n"; 95 $sToRender .= "<tr>\n";
96 - $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"; 96 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
97 $sToRender .= "</tr>\n"; 97 $sToRender .= "</tr>\n";
98 $sToRender .= "</table>\n"; 98 $sToRender .= "</table>\n";
99 99
@@ -102,7 +102,7 @@ function getFailPage() { @@ -102,7 +102,7 @@ function getFailPage() {
102 102
103 103
104 // if edition is successful print otu success page 104 // if edition is successful print otu success page
105 -function getTextPage() { 105 +function getTextPage($iDocFieldID = null) {
106 global $default; 106 global $default;
107 107
108 $sToRender .= renderHeading("Add Document Field Lookup"); 108 $sToRender .= renderHeading("Add Document Field Lookup");
@@ -112,7 +112,7 @@ function getTextPage() { @@ -112,7 +112,7 @@ function getTextPage() {
112 $sToRender .= "<tr></tr>\n"; 112 $sToRender .= "<tr></tr>\n";
113 $sToRender .= "<tr></tr>\n"; 113 $sToRender .= "<tr></tr>\n";
114 $sToRender .= "<tr>\n"; 114 $sToRender .= "<tr>\n";
115 - $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"; 115 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
116 $sToRender .= "</tr>\n"; 116 $sToRender .= "</tr>\n";
117 $sToRender .= "</table>\n"; 117 $sToRender .= "</table>\n";
118 118
@@ -136,7 +136,7 @@ function getCancelButton($oDocField) { @@ -136,7 +136,7 @@ function getCancelButton($oDocField) {
136 return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n"; 136 return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
137 } 137 }
138 else { 138 else {
139 - return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n"; 139 + return "<td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=" . $oDocField->getId() . " \"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
140 } 140 }
141 } 141 }
142 142
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataBL.php
  View file @497d8d8
@@ -45,12 +45,12 @@ if (checkSession()) { @@ -45,12 +45,12 @@ if (checkSession()) {
45 $oMetaData = new MetaData($fDocFieldID,$fMetaDataName); 45 $oMetaData = new MetaData($fDocFieldID,$fMetaDataName);
46 $oMetaData->setMetaDataID($fDocFieldID,$fOldMetaDataName); 46 $oMetaData->setMetaDataID($fDocFieldID,$fOldMetaDataName);
47 if($oMetaData->update()) { 47 if($oMetaData->update()) {
48 - $oPatternCustom->setHtml(getSuccessPage()); 48 + $oPatternCustom->setHtml(getSuccessPage($fDocFieldID));
49 } else { 49 } else {
50 - $oPatternCustom->setHtml(getFailPage()); 50 + $oPatternCustom->setHtml(getFailPage($fDocFieldID));
51 } 51 }
52 } else { 52 } else {
53 - $oPatternCustom->setHtml(getTextPage()); 53 + $oPatternCustom->setHtml(getTextPage($fDocFieldID));
54 } 54 }
55 } 55 }
56 56
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc
  View file @497d8d8
@@ -115,7 +115,7 @@ function getEditMetaDataPage($iDocFieldID, $iMetaDataID) { @@ -115,7 +115,7 @@ function getEditMetaDataPage($iDocFieldID, $iMetaDataID) {
115 } 115 }
116 116
117 // if edition is successful print otu success page 117 // if edition is successful print otu success page
118 -function getSuccessPage() { 118 +function getSuccessPage($iDocFieldID = null) {
119 global $default; 119 global $default;
120 120
121 $sToRender .= renderHeading("Edit Document Field Lookup"); 121 $sToRender .= renderHeading("Edit Document Field Lookup");
@@ -125,7 +125,7 @@ function getSuccessPage() { @@ -125,7 +125,7 @@ function getSuccessPage() {
125 $sToRender .= "<tr></tr>\n"; 125 $sToRender .= "<tr></tr>\n";
126 $sToRender .= "<tr></tr>\n"; 126 $sToRender .= "<tr></tr>\n";
127 $sToRender .= "<tr>\n"; 127 $sToRender .= "<tr>\n";
128 - $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"; 128 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
129 $sToRender .= "</tr>\n"; 129 $sToRender .= "</tr>\n";
130 $sToRender .= "</table>\n"; 130 $sToRender .= "</table>\n";
131 131
@@ -133,7 +133,7 @@ function getSuccessPage() { @@ -133,7 +133,7 @@ function getSuccessPage() {
133 } 133 }
134 134
135 // if edition is successful print otu success page 135 // if edition is successful print otu success page
136 -function getFailPage() { 136 +function getFailPage($iDocFieldID = null) {
137 global $default; 137 global $default;
138 138
139 $sToRender .= renderHeading("Edit Document Field Lookup"); 139 $sToRender .= renderHeading("Edit Document Field Lookup");
@@ -143,7 +143,7 @@ function getFailPage() { @@ -143,7 +143,7 @@ function getFailPage() {
143 $sToRender .= "<tr></tr>\n"; 143 $sToRender .= "<tr></tr>\n";
144 $sToRender .= "<tr></tr>\n"; 144 $sToRender .= "<tr></tr>\n";
145 $sToRender .= "<tr>\n"; 145 $sToRender .= "<tr>\n";
146 - $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"; 146 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
147 $sToRender .= "</tr>\n"; 147 $sToRender .= "</tr>\n";
148 $sToRender .= "</table>\n"; 148 $sToRender .= "</table>\n";
149 149
@@ -152,7 +152,7 @@ function getFailPage() { @@ -152,7 +152,7 @@ function getFailPage() {
152 152
153 153
154 // if edition is successful print otu success page 154 // if edition is successful print otu success page
155 -function getTextPage() { 155 +function getTextPage($iDocFieldID = null) {
156 global $default; 156 global $default;
157 157
158 $sToRender .= renderHeading("Edit Document Field Lookup"); 158 $sToRender .= renderHeading("Edit Document Field Lookup");
@@ -162,7 +162,7 @@ function getTextPage() { @@ -162,7 +162,7 @@ function getTextPage() {
162 $sToRender .= "<tr></tr>\n"; 162 $sToRender .= "<tr></tr>\n";
163 $sToRender .= "<tr></tr>\n"; 163 $sToRender .= "<tr></tr>\n";
164 $sToRender .= "<tr>\n"; 164 $sToRender .= "<tr>\n";
165 - $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"; 165 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
166 $sToRender .= "</tr>\n"; 166 $sToRender .= "</tr>\n";
167 $sToRender .= "</table>\n"; 167 $sToRender .= "</table>\n";
168 168
@@ -186,7 +186,7 @@ function getCancelButton($oDocField) { @@ -186,7 +186,7 @@ function getCancelButton($oDocField) {
186 return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n"; 186 return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /></a></td>\n";
187 } 187 }
188 else { 188 else {
189 - return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n"; 189 + return "<td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=" . $oDocField->getId() . "\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
190 } 190 }
191 } 191 }
192 192
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataBL.php
  View file @497d8d8
@@ -43,9 +43,9 @@ if (checkSession()) { @@ -43,9 +43,9 @@ if (checkSession()) {
43 $oMetaData = new MetaData($fDocFieldID,$fMetaDataName); 43 $oMetaData = new MetaData($fDocFieldID,$fMetaDataName);
44 $oMetaData->setMetaDataID($fDocFieldID,$fMetaDataName); 44 $oMetaData->setMetaDataID($fDocFieldID,$fMetaDataName);
45 if($oMetaData->delete()) { 45 if($oMetaData->delete()) {
46 - $oPatternCustom->setHtml(getSuccessPage()); 46 + $oPatternCustom->setHtml(getSuccessPage($fDocFieldID));
47 } else { 47 } else {
48 - $oPatternCustom->setHtml(getFailPage()); 48 + $oPatternCustom->setHtml(getFailPage($fDocFieldID));
49 } 49 }
50 } 50 }
51 51
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc
  View file @497d8d8
@@ -93,7 +93,7 @@ function getDeleteConfirmedPage($iDocFieldID, $iMetaDataID) { @@ -93,7 +93,7 @@ function getDeleteConfirmedPage($iDocFieldID, $iMetaDataID) {
93 } 93 }
94 94
95 // if edition is successful print otu success page 95 // if edition is successful print otu success page
96 -function getSuccessPage() { 96 +function getSuccessPage($iDocFieldID = null) {
97 global $default; 97 global $default;
98 98
99 $sToRender .= renderHeading("Remove Document Field Lookup"); 99 $sToRender .= renderHeading("Remove Document Field Lookup");
@@ -103,7 +103,7 @@ function getSuccessPage() { @@ -103,7 +103,7 @@ function getSuccessPage() {
103 $sToRender .= "<tr></tr>\n"; 103 $sToRender .= "<tr></tr>\n";
104 $sToRender .= "<tr></tr>\n"; 104 $sToRender .= "<tr></tr>\n";
105 $sToRender .= "<tr>\n"; 105 $sToRender .= "<tr>\n";
106 - $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"; 106 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
107 $sToRender .= "</tr>\n"; 107 $sToRender .= "</tr>\n";
108 $sToRender .= "</table>\n"; 108 $sToRender .= "</table>\n";
109 109
@@ -111,7 +111,7 @@ function getSuccessPage() { @@ -111,7 +111,7 @@ function getSuccessPage() {
111 } 111 }
112 112
113 // if edition is successful print otu success page 113 // if edition is successful print otu success page
114 -function getFailPage() { 114 +function getFailPage($iDocFieldID = null) {
115 global $default; 115 global $default;
116 116
117 $sToRender .= renderHeading("Remove Document Field Lookup"); 117 $sToRender .= renderHeading("Remove Document Field Lookup");
@@ -121,7 +121,7 @@ function getFailPage() { @@ -121,7 +121,7 @@ function getFailPage() {
121 $sToRender .= "<tr></tr>\n"; 121 $sToRender .= "<tr></tr>\n";
122 $sToRender .= "<tr></tr>\n"; 122 $sToRender .= "<tr></tr>\n";
123 $sToRender .= "<tr>\n"; 123 $sToRender .= "<tr>\n";
124 - $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"; 124 + $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=$iDocFieldID\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
125 $sToRender .= "</tr>\n"; 125 $sToRender .= "</tr>\n";
126 $sToRender .= "</table>\n"; 126 $sToRender .= "</table>\n";
127 127
@@ -144,7 +144,7 @@ function getCancelButton($oDocField) { @@ -144,7 +144,7 @@ function getCancelButton($oDocField) {
144 if (!isset($oDocField)) { 144 if (!isset($oDocField)) {
145 return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border = \"0\"/></a></td>\n"; 145 return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border = \"0\"/></a></td>\n";
146 } else { 146 } else {
147 - return "<td align = right><a href=\"$default->rootUrl/control.php?action=listDocFields\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n"; 147 + return "<td align = right><a href=\"$default->rootUrl/control.php?action=editDocFieldLookups&fDocFieldID=" . $oDocField->getId() . "\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
148 } 148 }
149 } 149 }
150 150