1. remove default user "atutor" for web service API which has been replaced by OAuth

2. on "edit user group" page, fix the problem that clicking on a row does not properly highlight the according checkbox and row

diff --git a/docs/install/db/db_schema.sql b/docs/install/db/db_schema.sql
index cb1355c..02f3fbb 100644 (file)
--- a/docs/install/db/db_schema.sql
+++ b/docs/install/db/db_schema.sql
@@ -1083,5 +1083,3 @@ INSERT INTO `user_group_privilege` (`user_group_id`, `privilege_id`, `user_requi
 INSERT INTO `user_group_privilege` (`user_group_id`, `privilege_id`, `user_requirement`) VALUES (3, 6, 0);\r
 INSERT INTO `user_group_privilege` (`user_group_id`, `privilege_id`, `user_requirement`) VALUES (3, 10, 0);\r
 \r
-# insert default atutor account\r
-INSERT INTO `users` (`user_id`, `login`, `password`, `user_group_id`, `first_name`, `last_name`, `web_service_id`, `status`, `create_date`) VALUES (1, 'ATutor', '0cbab2aec26a53b0107487d43b1b8eb29384ad10', 2, 'ATutor', 'ATutor', '90c3cd6f656739969847f3a99ac0f3c7', 1, now());\r

diff --git a/docs/themes/default/user/user_group_create_edit.tmpl.php b/docs/themes/default/user/user_group_create_edit.tmpl.php
index 780e697..5fdf606 100644 (file)
--- a/docs/themes/default/user/user_group_create_edit.tmpl.php
+++ b/docs/themes/default/user/user_group_create_edit.tmpl.php
@@ -79,17 +79,16 @@ include(TR_INCLUDE_PATH.'header.inc.php');
 \r
                        <tbody>\r
        <?php foreach ($this->privs_rows as $privs_row) { ?>\r
-                       <tr id="rdel_privileges_<?php echo $privs_row['privilege_id']; ?>">\r
-                               <td onmousedown="document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked = !document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked; togglerowhighlight(document.getElementById('rdel_privileges_<?php echo $privs_row['privilege_id']; ?>'), 'del_privileges_<?php echo $privs_row['privilege_id']; ?>');" \r
-                           onkeydown="document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked = !document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked; togglerowhighlight(document.getElementById('rdel_privileges_<?php echo $privs_row['privilege_id']; ?>'), 'del_privileges_<?php echo $privs_row['privilege_id']; ?>');">\r
-                               <input type="checkbox" name="del_privileges_id[]" value="<?php echo $privs_row['privilege_id']; ?>" id="del_privileges_<?php echo $privs_row['privilege_id']; ?>" \r
-                                          onmouseup="this.checked=!this.checked" onkeyup="this.checked=!this.checked" \r
-                                          <?php if (is_array($_POST['del_privileges_id']) && in_array($privs_row['privilege_id'], $_POST['del_privileges_id'])) echo 'checked="checked"';?> />\r
+                       <tr id="rdp_<?php echo $privs_row['privilege_id']; ?>"\r
+                           onmousedown="document.input_form['dp_<?php echo $privs_row['privilege_id']; ?>'].checked = !document.input_form['dp_<?php echo $privs_row['privilege_id']; ?>'].checked; togglerowhighlight(this, 'dp_<?php echo $privs_row['privilege_id']; ?>');" \r
+                           onkeydown="document.input_form['dp_<?php echo $privs_row['privilege_id']; ?>'].checked = !document.input_form['dp_<?php echo $privs_row['privilege_id']; ?>'].checked; togglerowhighlight(this, 'dp_<?php echo $privs_row['privilege_id']; ?>');">\r
+                               <td>\r
+                               <input type="checkbox" name="del_privileges_id[]" value="<?php echo $privs_row['privilege_id']; ?>" id="dp_<?php echo $privs_row['privilege_id']; ?>" \r
+                                          onmouseup="this.checked=!this.checked" onkeyup="this.checked=!this.checked" />\r
                                </td>\r
 \r
-                               <td onmousedown="document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked = !document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked; togglerowhighlight(document.getElementById('rdel_privileges_<?php echo $privs_row['privilege_id']; ?>'), 'del_privileges_<?php echo $privs_row['privilege_id']; ?>');" \r
-                           onkeydown="document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked = !document.input_form['del_privileges_<?php echo $privs_row['privilege_id']; ?>'].checked; togglerowhighlight(document.getElementById('rdel_privileges_<?php echo $privs_row['privilege_id']; ?>'), 'del_privileges_<?php echo $privs_row['privilege_id']; ?>');">\r
-                                       <label for="del_privileges_<?php echo $privs_row['privilege_id']; ?>"><?php echo $privs_row['description']; ?></label>\r
+                               <td>\r
+                                       <label for="dp_<?php echo $privs_row['privilege_id']; ?>"><?php echo $privs_row['description']; ?></label>\r
                                </td>\r
 \r
                                <td>\r
@@ -130,13 +129,16 @@ include(TR_INCLUDE_PATH.'header.inc.php');
                        \r
                        <tbody>\r
        <?php foreach ($this->privs_to_add_rows as $privileges_to_add_row) { ?>\r
-                       <tr onmousedown="document.input_form['add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked = !document.input_form['add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked; togglerowhighlight(this, 'add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>');" \r
-                           onkeydown="document.input_form['add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked = !document.input_form['add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked; togglerowhighlight(this, 'add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>');"\r
-                           id="radd_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>">\r
-                               <td><input type="checkbox" name="add_privileges_id[]" value="<?php echo $privileges_to_add_row['privilege_id']; ?>" id="add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>" \r
-                                          onmouseup="this.checked=!this.checked" onkeyup="this.checked=!this.checked" \r
-                                          <?php if (is_array($_POST['add_privileges_id']) && in_array($privileges_to_add_row['privilege_id'], $_POST['add_privileges_id'])) echo 'checked="checked"';?> /></td>\r
-                               <td><label for="add_privileges_<?php echo $privileges_to_add_row['privilege_id']; ?>"><?php echo $privileges_to_add_row['description']; ?></label></td>\r
+                       <tr onmousedown="document.input_form['ap_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked = !document.input_form['ap_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked; togglerowhighlight(this, 'ap_<?php echo $privileges_to_add_row['privilege_id']; ?>');" \r
+                           onkeydown="document.input_form['ap_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked = !document.input_form['ap_<?php echo $privileges_to_add_row['privilege_id']; ?>'].checked; togglerowhighlight(this, 'ap_<?php echo $privileges_to_add_row['privilege_id']; ?>');"\r
+                           id="rap_<?php echo $privileges_to_add_row['privilege_id']; ?>">\r
+                               <td>\r
+                                 <input type="checkbox" name="add_privileges_id[]" value="<?php echo $privileges_to_add_row['privilege_id']; ?>" id="ap_<?php echo $privileges_to_add_row['privilege_id']; ?>" \r
+                                          onmouseup="this.checked=!this.checked" onkeyup="this.checked=!this.checked" />\r
+                               </td>\r
+                               <td>\r
+                                 <label for="ap_<?php echo $privileges_to_add_row['privilege_id']; ?>"><?php echo $privileges_to_add_row['description']; ?></label>\r
+                               </td>\r
                        </tr>\r
        <?php } // end of foreach?>\r
                        </tbody>\r