Changeset 1089

Timestamp:

12/22/09 19:17:47 (2 years ago)

Author:

bogdan2412

Message:

Changed tag_get to return tags consistently with the rest of the code (without tag_ prefix).

Location:

trunk

Files:

• common/db/tags.php (modified) (2 diffs)
• common/tags.php (modified) (2 diffs)
• www/controllers/task.php (modified) (2 diffs)
• www/macros/macro_algorithmtags.php (modified) (2 diffs)
• www/static/css/sitewide.css (modified) (1 diff)
• www/views/blog_admin.php (deleted)
• www/views/blog_index.php (modified) (1 diff)
• www/views/blog_view.php (modified) (1 diff)
• www/views/task_tag_edit.php (modified) (1 diff)

trunk/common/db/tags.php

@@ -45 +45 @@
     }
     $query = sprintf(
-        "SELECT %s_id, tag_id,
-        tags.name AS tag_name, tags.type AS tag_type, tags.parent AS tag_parent
+        "SELECT %s_id, tag_id AS id,
+        tags.name AS name, tags.type AS type, tags.parent AS parent
         FROM ia_%s_tags AS obj_tags
         LEFT JOIN ia_tags AS tags ON obj_tags.tag_id = tags.id
         WHERE %s_id = %s%s%s
-        ORDER BY tag_name",
+        ORDER BY name",
         db_escape($obj), db_escape($obj), db_escape($obj),
         db_quote($obj_id), $where_type, $where_parent
@@ -104 +104 @@
 function tag_get_by_ids($tag_ids) {
     $query = sprintf(
-            "SELECT `id` AS tag_id, `name` AS tag_name,
-                    `parent` AS tag_parent, `type` AS tag_type
+            "SELECT `id`, `name`, `type`, `parent`
             FROM ia_tags
             WHERE `id` IN (%s)", implode(', ', array_map('db_quote', $tag_ids))

trunk/common/tags.php

@@ -47 +47 @@
     $tag_names = array();
     foreach ($tag_list as $tag) {
-        $tag_names[] = $tag['tag_name'];
+        $tag_names[] = $tag['name'];
     }
     return implode(", ", $tag_names);
@@ -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['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']];
+        log_assert(isset($parent_tags_key[$tag['parent']]), "Child tag doesn't have a parent");
+        $parent_tag_key = $parent_tags_key[$tag['parent']];
         $parent_tags[$parent_tag_key]['sub_tags'][] = $tag;
     }

trunk/www/controllers/task.php

@@ -302 +302 @@
         $count = 0;
         foreach ($algorithm_tags as $tag) {
-            if ($tag['tag_type'] == 'algorithm') {
+            if ($tag['type'] == 'algorithm') {
                 $count++;
             }
@@ -317 +317 @@
     $tags = tag_get_all( Array('method') );
     $sub_tags = tag_get_all( Array('algorithm') );
-
-    // Build_tags_tree looks for tag_id, tag_name etc.
-    // tag_get_all return id, name, etc.
-    foreach ($tags as &$tag) {
-        $tag['tag_id'] = $tag['id'];
-        $tag['tag_name'] = $tag['name'];
-        $tag['tag_type'] = $tag['type'];
-        $tag['tag_parent'] = $tag['parent'];
-    }
-
-    // Same for subtags
-    foreach ($sub_tags as &$tag) {
-        $tag['tag_id'] = $tag['id'];
-        $tag['tag_name'] = $tag['name'];
-        $tag['tag_type'] = $tag['type'];
-        $tag['tag_parent'] = $tag['parent'];
-    }
 
     $tags_tree = build_tags_tree($tags, $sub_tags);

trunk/www/macros/macro_algorithmtags.php

@@ -34 +34 @@
     $html_code .= '<ul id="task_tags">';
     foreach ($tags_tree as $tag) {
-        $tag_id = $tag['tag_id'];
-        $tag_name = $tag['tag_name'];
+        $tag_id = $tag['id'];
+        $tag_name = $tag['name'];
         $cnt_subtags = count($tag['sub_tags']);
         if ($cnt_subtags > 1) {
@@ -45 +45 @@
         $subtags_html = Array();
         foreach ($tag['sub_tags'] as $subtag) {
-            $subtags_html[] = '<div class="sub_tag_name">'.$subtag['tag_name'].'</div>';
+            $subtags_html[] = '<div class="sub_tag_name">'.$subtag['name'].'</div>';
         }
 

trunk/www/static/css/sitewide.css

@@ -276 +276 @@
 }
 
+/* Tag lists */
+ul.tag_list { 
+    list-style-type: none; 
+} 
+ 
+li.tag_list_item { 
+    padding-left: 15px; 
+} 
+
 .sub_tag_name {
     display: inline;

trunk/www/views/blog_index.php

@@ -45 +45 @@
     echo '<strong>Categorii: </strong>';
     foreach ($subpage['tags'] as $tag) {
-        echo format_link(url_blog($tag['tag_name']), $tag['tag_name'], true).' ';
+        echo format_link(url_blog($tag['name']), $tag['name'], true).' ';
     }
     echo '</div></div>';

trunk/www/views/blog_view.php

@@ -29 +29 @@
 echo '<strong>Categorii: </strong>';
 foreach ($tags as $tag) {
-    echo format_link(url_blog($tag['tag_name']), $tag['tag_name'], true).' ';
+    echo format_link(url_blog($tag['name']), $tag['name'], true).' ';
 }
 echo '<br/>';

trunk/www/views/task_tag_edit.php

@@ -11 +11 @@
     $tags_tree = $view['tags_tree'];
     foreach ($tags_tree as $tag) {
-        echo '<h3>'.$tag['tag_name'].'</h3><ul class="tag_list">';
+        echo '<h3>'.$tag['name'].'</h3><ul class="tag_list">';
         foreach ($tag['sub_tags'] as $sub_tag) {
             // Check if tag is already assigned to this task
             $checked = '';
             foreach ($task_tags as $task_tag) {
-                if ($task_tag['tag_id'] == $sub_tag['tag_id']) {
+                if ($task_tag['id'] == $sub_tag['id']) {
                     $checked = "checked";
                 }
             }
             echo '<li class="tag_list_item">
-                    <input type="checkbox" '.$checked.' name="algorithm_tags[]" value="'.$sub_tag['tag_id'].'"/> '
-                    .$sub_tag['tag_name'].
+                    <input type="checkbox" '.$checked.' name="algorithm_tags[]" value="'.$sub_tag['id'].'"/> '
+                    .$sub_tag['name'].
                 '</li>';
         }