Changeset 1083 for trunk/common

Timestamp:

12/21/09 14:03:40 (2 years ago)

Author:

bogdan2412

Message:

Many small fixes from live.

• Moved admin/task_tags to admin/task-tags because that's apparently how we do urls.
• Fixed autocomplete showing up only under the first tag form in the page.
• Added "number of tasks" column to admin/task-tags page and made it and "Operations" column fixed width.
• Disabled deletion of algorithm tags that are in use.
• Allow ( and ) in algorithm tags. (for Sortare O(NlogN))
• Made age_group no longer depend on the contest.

REVIEW URL: ​http://reviewboard.infoarena.ro/r/123/

Location:

trunk/common

Files:

• common.php (modified) (1 diff)
• tags.php (modified) (1 diff)

trunk/common/common.php

@@ -47 +47 @@
 define("IA_RE_ROUND_ID", '[a-z0-9][a-z0-9_\-\.]*');
 define("IA_RE_TASK_ID", '(?-i:[a-z0-9][a-z0-9_\-\.]*)');
-define("IA_RE_TAG_NAME", '[a-z0-9\-\.\ \@]+');
+define("IA_RE_TAG_NAME", '[a-z0-9\-\.\ \@\(\)]+');
 define("IA_RE_SCORE_NAME", '[a-z0-9][a-z0-9_\-\.]*');
 define("IA_RE_USER_NAME", '[_@a-z0-9][a-z0-9_\-\.\@]*');

trunk/common/tags.php

@@ -62 +62 @@
     foreach ($parent_tags as $key => $tag) {
         $parent_tags[$key]['sub_tags'] = Array();
-        $parent_tags_key[ $tag['tag_id'] ] = $key;
+        $parent_tags_key[$tag['tag_id']] = $key;
     }
 
     foreach ($sub_tags as $tag) {
-        log_assert(isset($parent_tags_key[ $tag['tag_parent'] ]), "Child tag doesn't have a parent");
-        $parent_tag_key = $parent_tags_key[ $tag['tag_parent'] ];
-        $parent_tags[ $parent_tag_key ]['sub_tags'][] = $tag;
+        log_assert(isset($parent_tags_key[$tag['tag_parent']]), "Child tag doesn't have a parent");
+        $parent_tag_key = $parent_tags_key[$tag['tag_parent']];
+        $parent_tags[$parent_tag_key]['sub_tags'][] = $tag;
     }