Peter M. Groen / knowledgetree

Commit dcb343c3efc2dfbd476acfa10aceb81869320021

Authored by michael
1 parent 4079982f

added validation and edited layout 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1663 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 11 additions and 17 deletions
presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleBL.php
  View file @dcb343c
... ... @@ -26,6 +26,7 @@ if (checkSession()) {
26 26 $oPatternCustom->setHtml(getPage());
27 27 $main->setCentralPayload($oPatternCustom);
28 28 $main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=editRole&fFromCreate=1&fRoleID="));
  29 + $main->setHasRequiredFields(true);
29 30 $main->render();
30 31 }
31 32 ?>
... ...
presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleBL.php
  View file @dcb343c
... ... @@ -76,6 +76,7 @@ if (checkSession()) {
76 76 }
77 77 //render the page
78 78 $main->setCentralPayload($oPatternCustom);
  79 + $main->setHasRequiredFields(true);
79 80 $main->render();
80 81 }
81 82 ?>
... ...
presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc
  View file @dcb343c
... ... @@ -12,7 +12,6 @@ function getCreatePage($iRoleID) {
12 12  
13 13 global $default;
14 14  
15   -
16 15 $sQuery = "SELECT * FROM $default->owl_roles_table WHERE id = $iRoleID";
17 16 $aDisplayColumns = array("name","can_read","can_write");
18 17 $aStoreColumns = array("name","can_read","can_write");
... ... @@ -27,7 +26,6 @@ function getCreatePage($iRoleID) {
27 26  
28 27 $sToRender .= "<table width=\"600\">" . renderHeading("Edit Role") . "</table>";
29 28 $sToRender .= "<table>\n";
30   - $sToRender .= "<br></br>\n";
31 29 $sToRender .= "<tr></tr>\n";
32 30 $sToRender .= "<tr>\n";
33 31 $sToRender .= "<td>" . $oPattern->render() . "</td>\n";
... ... @@ -39,15 +37,10 @@ function getCreatePage($iRoleID) {
39 37  
40 38 $sToRender .= "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/update.gif\" value=\"Update\" border=\"0\"/><a href=\"$default->rootUrl/control.php?action=addRole\"><img src =\"$default->graphicsUrl/widgets/cancel.gif\" border = \"0\" /></a></td>\n";
41 39 $sToRender .= "</table>\n";
42   -
43   -
44   -
  40 +
45 41 return $sToRender;
46   -
47   -
48 42 }
49 43  
50   -
51 44 // if fails ..
52 45 function getAddFailPage() {
53 46  
... ... @@ -55,8 +48,6 @@ function getAddFailPage() {
55 48  
56 49 $sToRender .= "<table width=\"600\">" . renderHeading("Edit Role") . "</table>";
57 50 $sToRender .= "<table>\n";
58   - $sToRender .= "<br></br>\n";
59   - $sToRender .= "<tr><b>Add Role Failed:</b></tr>\n";
60 51 $sToRender .= "<tr>\n";
61 52 $sToRender .= "<td>Sorry, Role Already Exists!</td>\n";
62 53 $sToRender .= "</tr>\n";
... ... @@ -68,7 +59,6 @@ function getAddFailPage() {
68 59 $sToRender .= "</table>\n";
69 60  
70 61 return $sToRender;
71   -
72 62 }
73 63  
74 64 // if its the manual edit page..then display normally
... ... @@ -77,14 +67,10 @@ function getEditPage($iRoleID) {
77 67 $oRole = null;
78 68 if (isset($iRoleID)) {
79 69 $oRole = Role::get($iRoleID);
80   -
81 70 }
82 71  
83   -
84 72 $sToRender .= "<table width=\"600\">" . renderHeading("Edit Role") . "</table>";
85   - $sToRender .= "<b>Edit Role Properties:</b>\n";
86 73 $sToRender .= "<table>\n";
87   - $sToRender .= "<br></br>\n";
88 74 $sToRender .= "<tr></tr>\n";
89 75 $sToRender .= "<tr>\n";
90 76 $sToRender .= "<td>Role Name: </td><td>" . getRoleDisplay($oRole) . "</td>\n";
... ... @@ -106,14 +92,20 @@ function getEditPage($iRoleID) {
106 92 $sToRender .= "</tr>\n";
107 93 }
108 94  
109   -
110 95 $sToRender .= "<tr>\n";
111 96 $sToRender .= "</tr>\n";
112 97 $sToRender .= "<td></td>" . getUpdateButton($oRole);
113 98 $sToRender .= getCancelButton($oRole);
114 99 $sToRender .= "</table>\n";
115 100  
116   -
  101 + $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
  102 + $sToRender .= "function validateForm(theForm) {\n";
  103 + $sToRender .= "\tif (!(validRequired(theForm.fRoleName, 'Role Name'))) {\n";
  104 + $sToRender .= "\t\treturn false;\n";
  105 + $sToRender .= "\t}\n";
  106 + $sToRender .= "return true;\n}\n";
  107 + $sToRender .= "//-->\n</script>\n\n";
  108 +
117 109 return $sToRender;
118 110 }
119 111  
... ...