Changeset 1080 for trunk/common

Timestamp:

12/14/09 19:14:17 (2 years ago)

Author:

bogdan2412

Message:

Admin interface for adding/renaming/deleting algorithm tags.

This interface can be seen at /admin/task_tags.

In addition, added proper tag validation in task_edit controller.

We were using a version of MochiKit? with some modules stripped out so that it would be smaller.
I needed MochiKit?.Selector, so I downloaded the full version. If anybody knows what modules we stripped out before, please tell me.

Added a new inline_form.js file which will prove useful when designing other interfaces with inline rename.

Review URL: ​http://reviewboard.infoarena.ro/r/119/

Location:

trunk/common

Files:

• db/tags.php (modified) (2 diffs)
• tags.php (modified) (2 diffs)

trunk/common/db/tags.php

@@ -6 +6 @@
 // Get list of all tag names, filtered by type and parent
 function tag_get_all($types = null, $parent = null) {
-    $query = "SELECT name, type, parent FROM ia_tags";
+    $query = "SELECT id, name, type, parent FROM ia_tags";
     $where = array();
     if (!is_null($types)) {
@@ -97 +97 @@
 }
 
+// Updates name, type or parent for a tag specified by it's id
+function tag_update_by_id($tag_id, $tag) {
+    $query = sprintf(
+        "UPDATE ia_tags SET name = %s, type = %s, parent = %s WHERE id = %s",
+        db_quote($tag["name"]), db_quote($tag["type"]),
+        db_quote($tag["parent"]), db_quote($tag_id));
+    db_query($query);
+    return db_affected_rows() == 1;
+}
+
+// Delete a tag identified by it's id
+function tag_delete_by_id($tag_id) {
+    db_query(sprintf(
+        "DELETE FROM ia_tags WHERE parent = %s", db_quote($tag_id)
+    ));
+    db_query(sprintf("DELETE FROM ia_tags WHERE id = %s", db_quote($tag_id)));
+    return db_affected_rows() == 1;
+}
+
 // Build ugly where clause to be used in subqueries
 function tag_build_where($obj, $tag_ids, $parent_table = null) {

trunk/common/tags.php

@@ -17 +17 @@
 }
 
-function tag_validate($data, &$errors) {
-    $tags = getattr($data, 'tags');
+function tag_validate($data, &$errors, $key = null, $parent_key = null) {
+    if (is_null($key)) {
+        $tag_key = 'tags';
+    } else {
+        $tag_key = 'tag_'.$key;
+    }
+    $tags = getattr($data, $tag_key);
     if (is_null($tags)) {
         return;
@@ -25 +30 @@
     foreach ($tags as $tag) {
         if (!is_tag_name($tag)) {
-            $errors['tags'] = "Cel putin un tag este gresit";
+            $errors[$tag_key] = "Cel putin un tag este gresit";
             return;
+        }
+    }
+    if (count($tags) > 0 && !is_null($parent_key)) {
+        $parent_tag = getattr($data, 'tag_'.$parent_key, "");
+        if (count(tag_split($parent_tag)) != 1) {
+            $errors['tag_'.$parent_key] = sprintf("Trebuie specificat exact
+                un tag '%s' pentru a specifica taguri '%s'", $parent_key, $key);
         }
     }