r1805 + initial implementation of the tag tree editor

+ fixed object tag editor

diff --git a/inc/database.php b/inc/database.php
index 5937bd12c32cd98d53e646dfcebe61fcad8ab453..1efabf6d0c1b38274be69440400f10f79297a38c 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -1765,13 +1765,14 @@ function useInsertBlade ($tablename, $values)
 
 // This swiss-knife blade deletes one record from the specified table
 // using the specified key name and value.
-function useDeleteBlade ($tablename, $keyname, $keyvalue, $quotekey = TRUE)
+function useDeleteBlade ($tablename, $keyname, $keyvalue, $quotekey = TRUE, $deleteall = FALSE)
 {
        global $dbxlink;
        if ($quotekey == TRUE)
-               $query = "delete from ${tablename} where ${keyname}='$keyvalue' limit 1";
-       else
-               $query = "delete from ${tablename} where ${keyname}=$keyvalue limit 1";
+               $keyvalue = "'${keyvalue}'";
+       $query = "delete from ${tablename} where ${keyname}=$keyvalue";
+       if (!$deleteall)
+               $query .= ' limit 1';
        $result = $dbxlink->exec ($query);
        if ($result === NULL)
                return FALSE;
@@ -2405,4 +2406,32 @@ function getTagList ()
        return $taglist;
 }
 
+function commitCreateTag ($tagname = '', $parent_id = 0)
+{
+       if ($tagname == '' or $parent_id === 0)
+               return "Invalid args to " . __FUNCTION__;
+       $result = useInsertBlade
+       (
+               'TagTree',
+               array
+               (
+                       'tag' => "'${tagname}'",
+                       'parent_id' => $parent_id
+               )
+       );
+       if ($result)
+               return '';
+       else
+               return "SQL query failed in " . __FUNCTION__;
+}
+
+function commitDestroyTag ($tagid = 0)
+{
+       if ($tagid == 0)
+               return 'Invalid arg to ' . __FUNCTION__;
+       if (useDeleteBlade ('TagTree', 'id', $tagid, FALSE))
+               return '';
+       else
+               return 'useDeleteBlade() failed in ' . __FUNCTION__;
+}
 ?>

diff --git a/inc/interface.php b/inc/interface.php
index 80932cc5a966401cf018f38676d8d955e53c2ae0..70a4aa10124bd305d4f2837a6d5c88f6f017392e 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -4608,28 +4608,66 @@ function renderAutoPortsForm ($object_id = 0)
        echo "</table>";
 }
 
-function renderTagRow ($taginfo, $level = 0)
+function renderTagRowForViewer ($taginfo, $level = 0)
 {
        echo '<tr><td>';
        for ($i = 0; $i < $level; $i++)
                printImageHREF ('spacer');
        echo $taginfo['tag'] . "</td></tr>\n";
        foreach ($taginfo['kids'] as $kid)
-               renderTagRow ($kid, $level + 1);
+               renderTagRowForViewer ($kid, $level + 1);
+}
+
+function renderTagRowForEditor ($taginfo, $level = 0)
+{
+       global $root, $pageno, $tabno;
+       echo '<tr><td>';
+       // FIXME: check [supplied] refcnt for each tag
+       echo "<a href='${root}process.php?page=${pageno}&tab=${tabno}&op=destroyTag&id=${taginfo['id']}'>";
+       printImageHREF ('delete', 'Destroy tag');
+       echo "</a></td>\n<td>";
+       for ($i = 0; $i < $level; $i++)
+               printImageHREF ('spacer');
+       echo $taginfo['tag'] . "</td><td>&nbsp;</td></tr>\n";
+       foreach ($taginfo['kids'] as $kid)
+               renderTagRowForEditor ($kid, $level + 1);
 }
 
 function renderTagTree ()
 {
-       $tree = getTagTree();
        echo '<table>';
-       foreach ($tree as $taginfo)
-               renderTagRow ($taginfo);
+       foreach (getTagTree() as $taginfo)
+       {
+               echo '<tr>';
+               renderTagRowForViewer ($taginfo);
+               echo "</tr>\n";
+       }
        echo '</table>';
 }
 
 function renderTagTreeEditor ()
 {
-       dragon();
+       global $root, $pageno, $tabno;
+       showMessageOrError();
+       echo "<table cellspacing=0 cellpadding=5 align=center class=widetable>\n";
+       echo "<tr><th>&nbsp;</th><th>tag</th><th>&nbsp;</th></tr>\n";
+       foreach (getTagTree() as $taginfo)
+       {
+               renderTagRowForEditor ($taginfo, TRUE);
+       }
+       echo "<form action='${root}process.php' method=post>";
+       echo "<input type=hidden name=page value='${pageno}'>";
+       echo "<input type=hidden name=tab value='${tabno}'>";
+       echo "<input type=hidden name=op value='createTag'>";
+       echo "<tr><td>";
+       printImageHREF ('grant', 'Create tag', TRUE);
+       echo '</td><td><input type=text name=tagname> under <select name=parent_id>';
+       echo "<option value=0>-- NONE --</option>\n";
+       foreach (getTagList() as $taginfo)
+               echo "<option value=${taginfo['id']}>${taginfo['tag']}</option>";
+       echo "</select></td><td>&nbsp;</td></tr>";
+       echo "</form>\n";
+       echo '</table>';
 }
 
 function renderTagOption ($taginfo, $level = 0)

diff --git a/inc/navigation.php b/inc/navigation.php
index 8a5089aae859873ab64b68be9108588363b10863..012b41bce6f277d23b016f5a4e093d291391e8d9 100644 (file)
--- a/inc/navigation.php
+++ b/inc/navigation.php
@@ -303,6 +303,9 @@ $tab['tagtree']['default'] = 'View';
 $tab['tagtree']['edit'] = 'Change';
 $tabhandler['tagtree']['default'] = 'renderTagTree';
 $tabhandler['tagtree']['edit'] = 'renderTagTreeEditor';
+$ophandler['tagtree']['edit']['destroyTag'] = 'destroyTag';
+$ophandler['tagtree']['edit']['createTag'] = 'createTag';
+$ophandler['tagtree']['edit']['updateTag'] = 'updateTag';
 
 $page['reports']['title'] = 'Reports';
 $page['reports']['parent'] = 'index';

diff --git a/inc/ophandlers.php b/inc/ophandlers.php
index 3dab40a3576f97ac87ac8916431820b8ade78895..2c2cf2f2af5b0658892b84535d742edc140ae57f 100644 (file)
--- a/inc/ophandlers.php
+++ b/inc/ophandlers.php
@@ -1319,7 +1319,7 @@ function saveObjectTags ()
        $object_id = $_REQUEST['object_id'];
        // Build a trail from the submitted data, minimize it,
        // then wipe existing records and store the new set instead.
-       useDeleteBlade ('RackObjectTags', 'object_id', $object_id);
+       useDeleteBlade ('RackObjectTags', 'object_id', $object_id, FALSE, TRUE);
        $newtrail = getExplicitTagsOnly (buildTrailFromIds ($_REQUEST['taglist']));
        $n_succeeds = $n_errors = 0;
        foreach ($newtrail as $taginfo)
@@ -1335,4 +1335,28 @@ function saveObjectTags ()
                return "${root}?page=${pageno}&tab=${tabno}&object_id=${object_id}&message=" . urlencode ("New trail is ${n_succeeds} tags long");
 }
 
+function destroyTag ()
+{
+       global $root, $pageno, $tabno;
+       assertUIntArg ('id');
+       if (($ret = commitDestroyTag ($_REQUEST['id'])) == '')
+               return "${root}?page=${pageno}&tab=${tabno}&message=" . urlencode ("Successfully deleted tag.");
+       else
+               return "${root}?page=${pageno}&tab=${tabno}&error=" . urlencode ("Error deleting tag: '${ret}'");
+}
+
+function createTag ()
+{
+       global $root, $pageno, $tabno;
+       assertStringArg ('tagname');
+       assertUIntArg ('parent_id', TRUE);
+       $tagname = trim ($_REQUEST['tagname']);
+       if (($parent_id = $_REQUEST['parent_id']) <= 0)
+               $parent_id = 'NULL';
+       if (($ret = commitCreateTag ($tagname, $parent_id)) == '')
+               return "${root}?page=${pageno}&tab=${tabno}&message=" . urlencode ("Created tag '${tagname}'.");
+       else
+               return "${root}?page=${pageno}&tab=${tabno}&error=" . urlencode ("Could not create tag '${tagname}' because of error '${ret}'");
+}
+
 ?>