Changeset 1097 for trunk

Timestamp:

12/27/09 01:24:58 (2 years ago)

Author:

bogdan2412

Message:

Admin edit button on task pages

Done by Toni. Solves ticket #308.
Review URL: ​http://reviewboard.infoarena.ro/r/129

Location:

trunk

Files:

• common/security.php (modified) (2 diffs)
• common/textblock.php (modified) (1 diff)
• www/views/textblock_header.php (modified) (1 diff)

trunk/common/security.php

@@ -211 +211 @@
 
     // Forward security to task.
-    if (preg_match("/^ \s* task: \s* (".IA_RE_TASK_ID.") \s* $/xi", $textsec, $matches)) {
+    if (($task_id = textblock_security_is_task($textsec))) {
         require_once(IA_ROOT_DIR . "common/db/task.php");
-        $task = task_get($matches[1]);
+        $task = task_get($task_id);
         if ($task === null) {
             log_warn("Bad security descriptor, ask an admin.");
@@ -310 +310 @@
     // Convert action into a grader action if the textblock is a task
     // textblock and the attachment has the grader_ prefix.
-    if (preg_match("/^ \s* task: \s* (".IA_RE_TASK_ID.") \s* $/xi", $tb["security"]) &&
+    if (textblock_security_is_task($tb['security']) &&
         preg_match('/^grader\_/', $att_name)) {
         $newaction = preg_replace('/^attach/', 'grader', $action);

trunk/common/textblock.php

@@ -188 +188 @@
 }
 
+// Checks if the textblock is task and return the task_id if true or false if false
+function textblock_security_is_task($textblock) {
+    if (preg_match("/^ \s* task: \s* (".IA_RE_TASK_ID.") \s* $/xi", $textblock, $matches)) {
+        return $matches[1];
+    }
+    return false;
+}
+
 ?>

trunk/www/views/textblock_header.php

@@ -10 +10 @@
 <div id="wikiOps">
     <ul>
+<?php if (($task_id = textblock_security_is_task($textblock['security'])) && identity_can('task-edit', $task = task_get($task_id))) { ?>
+<li><?= format_link_access(url_task_edit($task['id']), 'Editeaza parametrii', 'p') ?></li>
+<?php } ?>
+<?php if ($task_id && identity_can('task-tag', $task)) { ?>
+<li><?= format_link_access(url_task_edit_tags($task['id']), 'Editeaza tag-uri', 't') ?></li>
+<?php } ?>
 <?php if (identity_can('textblock-edit', $textblock)) { ?>
-<li><?= format_link_access(url_textblock_edit($textblock['name']), 'Editeaza', 'e') ?></li>
+<li><?= format_link_access(url_textblock_edit($textblock['name']), ($task_id) ? 'Editeaza enunt' :'Editeaza', 'e') ?></li>
 <?php } ?>
 <?php if (identity_can('textblock-history', $textblock)) { ?>