Fixed user add to hide projects for client role.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8b2787ff2ea70bf5b9e2fae74cf38ab0f216cac7..5d4037a57f40e3eb2979c40a4f146f70273c8273 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.37.4742 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.37.4743 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/user_add.tpl b/WEB-INF/templates/user_add.tpl
index 0741dc3e9f873af30fbb2adf016c58a2aec47c4d..c6dbaa7bbd543aadbe3a4df95c54c407846b2661 100644 (file)
--- a/WEB-INF/templates/user_add.tpl
+++ b/WEB-INF/templates/user_add.tpl
@@ -29,20 +29,31 @@ function setDefaultRate(element) {
   }
 }
 
   }
 }
 

-// handleClientControl - controls visibility of the client dropdown depending on the selected user role.
-// We need to show it only when the "Client" user role is selected.
+// handleClientControl - controls visibility of the client dropdown depending on the selected user role,
+// also hides and unselects projects when "Client" user role is selected.

 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");
 function handleClientControl() {
   var selectedRoleId = document.getElementById("role").value;
   var clientControl = document.getElementById("client");

+  var projectsControl = document.getElementById("projects_control");
+

   var len = roles.length;
   for (var i = 0; i < len; i++) {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];
   var len = roles.length;
   for (var i = 0; i < len; i++) {
     if (selectedRoleId == roles[i][0]) {
       var isClient = roles[i][1];

-      if (isClient == 1)
+      if (isClient == 1) {

         clientControl.style.visibility = "visible";
         clientControl.style.visibility = "visible";

-      else {
-        clientControl.value = '';
+        projectsControl.style.display = "none";
+
+        // Uncheck all project checkboxes.
+        var checkboxes = document.getElementsByName("projects[]");
+        var j;
+        for (j = 0; j < checkboxes.length; j++) {
+          checkboxes[j].checked = false;
+        }
+      } else {
+        clientControl.value = "";

         clientControl.style.visibility = "hidden";
         clientControl.style.visibility = "hidden";

+        projectsControl.style.display = "";

       }
       break;
     }
       }
       break;
     }


@@ -90,11 +101,13 @@ function handleClientControl() {
     </tr>
 {/if}
 {if $show_projects}
     </tr>
 {/if}
 {if $show_projects}

+<tbody id="projects_control">

     <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     </tr>
     <tr><td>&nbsp;</td></tr>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     </tr>

+</tbody>

 {/if}
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>
 {/if}
     <tr>
       <td colspan="2" align="center">{$i18n.label.required_fields}</td>

diff --git a/WEB-INF/templates/user_edit.tpl b/WEB-INF/templates/user_edit.tpl
index f9ec2334792c970e30efb8cb062797a729b8a8ab..2bba1842d81231db1aaf0beff06b753d67ae0ab3 100644 (file)
--- a/WEB-INF/templates/user_edit.tpl
+++ b/WEB-INF/templates/user_edit.tpl
@@ -135,8 +135,8 @@ function handleClientControl() {
     </tr>
 {/if}
 {if $show_projects}
     </tr>
 {/if}
 {if $show_projects}

-    <tr><td>&nbsp;</td></tr>

 <tbody id="projects_control">
 <tbody id="projects_control">

+    <tr><td>&nbsp;</td></tr>

     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>
     <tr valign="top">
       <td align="right">{$i18n.label.projects}:</td>
       <td>{$forms.userForm.projects.control}</td>

diff --git a/user_add.php b/user_add.php
index cf233d5b55f8ec5e98e6c7a82865ea3fd1d2f949..5696d28fa67e6735a8db905d3b107d8a62db8255 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -126,7 +126,7 @@ class RateCellRenderer extends DefaultCellRenderer {
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');

-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));

 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');