Changeset 1053 for trunk

Timestamp:

09/26/09 22:56:53 (3 years ago)

Author:

bogdan2412

Message:

Allow admins to change task owners - closes ticket #374.

Reviewed: ​http://reviewboard.infoarena.ro/r/93/

Location:

trunk

Files:

• common/security.php (modified) (1 diff)
• www/controllers/task.php (modified) (2 diffs)
• www/views/task_edit.php (modified) (3 diffs)

trunk/common/security.php

@@ -142 +142 @@
         case 'task-change-open':
         case 'textblock-change-security':
+        case 'task-edit-owner':
         case 'task-tag':
         case 'round-tag':

trunk/www/controllers/task.php

@@ -66 +66 @@
     // Tag data
     $values['tags'] = request('tags', tag_build_list("task", $task_id));
-    
+
+    // Task owner
+    if (identity_can('task-edit-owner', $task)) {
+        if ($task["user_id"]) {
+            $user = user_get_by_id($task["user_id"]);
+            log_assert($user, "Task has invalid user_id");
+            $username = $user["username"];
+        } else {
+            $username = "";
+        }
+        $values["user"] = request("user", $username);
+    }
+
     // Validate the monkey.
     if (request_is_post()) {
@@ -73 +85 @@
         foreach ($fields as $field) {
             $new_task[$field] = $values[$field];
+        }
+
+        if (identity_can('task-edit-owner', $task)) {
+            if ($values["user"] == "") {
+                $new_task["user_id"] = 0;
+            } else {
+                $user = user_get_by_username($values["user"]);
+                if (!$user) {
+                    $errors["user"] = "Utilizator inexistent";
+                } else {
+                    $new_task["user_id"] = $user["id"];
+                }
+            }
         }
 

trunk/www/views/task_edit.php

@@ -21 +21 @@
         'page_name' => array(
                 'name' => "Pagina cu enuntul",
-                'description' => "Aceasta este pagina la care este trimis utilizatorul ".
-                                 "cand da click pe o problema",
+                'description' => "Aceasta este pagina la care este trimis ".
+                                 "utilizatorul cand da click pe o problema",
+                'type' => 'string',
+        ),
+        'user' => array(
+                'name' => "Utilizatorul care adauga problema",
+                'description' => "Utilizatorul care are drepturi de editare ".
+                                 "asupra problemei. Poate fi lasat gol.",
                 'type' => 'string',
         ),
@@ -111 +117 @@
         <?= view_form_field_li($form_fields['title'], 'title') ?>
         <?= view_form_field_li($form_fields['page_name'], 'page_name') ?>
+        <?php if (identity_can('task-edit-owner', $task)) { ?>
+            <?= view_form_field_li($form_fields['user'], 'user') ?>
+        <?php } ?>
         <?= view_form_field_li($form_fields['author'], 'author') ?>
         <?= view_form_field_li($form_fields['source'], 'source') ?>
-        <?php if (identity_can('task-change-security', $task)) { ?> 
+        <?php if (identity_can('task-change-security', $task)) { ?>
            <?= view_form_field_li($form_fields['hidden'], 'hidden') ?>
         <?php } ?>
@@ -125 +134 @@
 // FIXME: Field should be generated from task_get_types()
 ?>
-    <?php if (identity_can('task-change-open', $task)) { ?> 
+    <?php if (identity_can('task-change-open', $task)) { ?>
     <fieldset>
     <legend>Acces la surse si teste</legend>