FIX:テンプレートSHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODYの修正

通常画面用・管理画面用の両テンプレートの一覧画面で共通のテンプレートを使用しているために、編集画面へのリンクがどちらか一方のものしか表示されなかった

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index ba1fa43..c72dcb6 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -1466,7 +1466,7 @@ function listplug_table_categorylist($vars, $type, $templateName = '')
 \r
 function listplug_table_templatelist($vars, $type, $templateName = '')\r
 {\r
-       global $manager;\r
+       global $manager, $CONF;\r
        \r
        $templates = array();\r
        if ( !empty($templateName) )\r
@@ -1500,13 +1500,13 @@ function listplug_table_templatelist($vars, $type, $templateName = '')
                                $template = "<td><%templatename%></td>\n"\r
                                          . "<td><%templatedesc%></td>\n"\r
                                          . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"index.php?action=templateedit&amp;templateid=<%templateid%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>\n"\r
+                                         . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>\n"\r
                                          . "</td>\n"\r
                                          . "<td style=\"white-space:nowrap\">\n"\r
                                          . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%></a>\n"\r
                                          . "</td>\n"\r
                                          . "<td style=\"white-space:nowrap\">\n"\r
-                                         . "<a href=\"index.php?action=templatedelete&amp;templateid=<%templateid%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>\n"\r
+                                         . "<a href=\"<%deleteurl%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>\n"\r
                                          . "</td>\n";\r
                        }\r
                        else\r
@@ -1514,16 +1514,22 @@ function listplug_table_templatelist($vars, $type, $templateName = '')
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];\r
                        }\r
                        \r
+                       $deleteurl      = $CONF['AdminURL'] . "index.php?action=templatedelete&templateid={$current->tdnumber}";\r
+                       $editurl        = $CONF['AdminURL'] . "index.php?action=templateedit&templateid={$current->tdnumber}";\r
+                       $cloneurl       = $CONF['AdminURL'] . "index.php?action=templateclone&templateid={$current->tdnumber}";\r
                        $url = "index.php?action=templateclone&templateid={$current->tdnumber}";\r
                        $data = array(\r
                                'templatename'  => Entity::hsc($current->tdname),\r
                                'templatedesc'  => Entity::hsc($current->tddesc),\r
                                'templateid'    => (integer) $current->tdnumber,\r
                                'tabindex'              => (integer) $vars['tabindex'],\r
-                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($url)),\r
+                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
+                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
+                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'clonebtn'              => _LISTS_CLONE,\r
                                'delbtn'                => _LISTS_DELETE,\r
+                               'adminflg'              => '',\r
                        );\r
                        break;\r
                case 'FOOT':\r
@@ -2099,7 +2105,7 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
 \r
 function listplug_table_admintemplatelist($vars, $type, $templateName = '')\r
 {\r
-       global $manager;\r
+       global $manager, $CONF;\r
        \r
        $templates = array();\r
        if ( !empty($templateName) )\r
@@ -2133,29 +2139,34 @@ function listplug_table_admintemplatelist($vars, $type, $templateName = '')
                                $template = "<td><%templatename%></td>\n"\r
                                          . "<td><%templatedesc%></td>\n"\r
                                          . "<td style=\"white-space:nowrap\">"\r
-                                         . "<a href=\"index.php?action=admintemplateedit&amp;templateid=<%templateid%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>\n"\r
+                                         . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>\n"\r
                                          . "</td>\n"\r
                                          . "<td style=\"white-space:nowrap\">\n"\r
                                          . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%></a>\n"\r
                                          . "</td>\n"\r
                                          . "<td style=\"white-space:nowrap\">\n"\r
-                                         . "<a href=\"index.php?action=admintemplatedelete&amp;templateid=<%templateid%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>\n"\r
+                                         . "<a href=\"<%deleteurl%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>\n"\r
                                          . "</td>\n";\r
                        }\r
                        else\r
                        {\r
                                $template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];\r
                        }\r
-                       $url = "index.php?action=admintemplateclone&templateid={$current->tdnumber}";\r
+                       $deleteurl      = $CONF['AdminURL'] . "index.php?action=admintemplatedelete&templateid={$current->tdnumber}";\r
+                       $editurl        = $CONF['AdminURL'] . "index.php?action=admintemplateedit&templateid={$current->tdnumber}";\r
+                       $cloneurl       = $CONF['AdminURL'] . "index.php?action=admintemplateclone&templateid={$current->tdnumber}";\r
                        $data = array(\r
                                'templatename'  => Entity::hsc($current->tdname),\r
                                'templatedesc'  => Entity::hsc($current->tddesc),\r
                                'templateid'    => (integer) $current->tdnumber,\r
                                'tabindex'              => (integer) $vars['tabindex'],\r
-                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($url)),\r
+                               'deleteurl'             => Entity::hsc($manager->addTicketToUrl($deleteurl)),\r
+                               'editurl'               => Entity::hsc($manager->addTicketToUrl($editurl)),\r
+                               'cloneurl'              => Entity::hsc($manager->addTicketToUrl($cloneurl)),\r
                                'editbtn'               => _LISTS_EDIT,\r
                                'clonebtn'              => _LISTS_CLONE,\r
                                'delbtn'                => _LISTS_DELETE,\r
+                               'adminflg'              => 'admin',\r
                        );\r
                        break;\r
                case 'FOOT':\r

diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml
index 3f96098..e92563c 100644 (file)
--- a/skins/admin/default/skinbackup.xml
+++ b/skins/admin/default/skinbackup.xml
@@ -2528,13 +2528,13 @@ selector();
     <part name="SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY"><![CDATA[<td><%templatename%></td>
 <td><%templatedesc%></td>
 <td style="white-space:nowrap">
-<a href="<%adminurl%>index.php?action=admintemplateedit&amp;templateid=<%templateid%>" tabindex="<%tabindex%>"><%editbtn%>
+<a href="<%editurl%>" tabindex="<%tabindex%>"><%editbtn%>
 </a></td>
 <td style="white-space:nowrap">
 <a href="<%cloneurl%>" tabindex="<%tabindex%>"><%clonebtn%>
 </a></td>
 <td style="white-space:nowrap">
-<a href="<%adminurl%>index.php?action=admintemplatedelete&amp;templateid=<%templateid%>" tabindex="<%tabindex%>"><%delbtn%>
+<a href="<%deleteurl%>" tabindex="<%tabindex%>"><%delbtn%>
 </a></td>
 ]]></part>
     <part name="SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD"><![CDATA[<th><%colblog%></th><th><%coldesc%></th><th colspan="2"><%colact%></th>