FIX: バッチリスト、ナビリストでテンプレートが適用されないバグ

コミット「b82168398ee0160603b015a4930998f6e656c098」においてshowlist.phpに追加したlistplug_batchlist()とlistplug_navlist()だが、引数にテンプレート名を持たないため、その後の処理にテンプレートが適用されない不具合があった。

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index b1122d5..630bcb2 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1375,7 +1375,7 @@ class AdminActions extends BaseActions
                {
                        $template['content']  = 'categorylist';
                        $template['tabindex'] = 200;
-                       $this->parser->parse(listplug_batchlist('category', $resource, 'table', $template));
+                       $this->parser->parse(listplug_batchlist('category', $resource, 'table', $template, $template_name));
                }
                else
                {
@@ -1518,7 +1518,7 @@ class AdminActions extends BaseActions
                        $template['content']  = 'teamlist';
                        $template['tabindex'] = 10;
                                
-                       $this->parser->parse(listplug_batchlist('team', $resource, 'table', $template));
+                       $this->parser->parse(listplug_batchlist('team', $resource, 'table', $template, $template_name));
                }
                else
                {
@@ -2253,7 +2253,7 @@ class AdminActions extends BaseActions
                        $template['content'] = 'memberlist';
                        $template['tabindex'] = 10;
                                
-                       $this->parser->parse(listplug_batchlist('member', $resource, 'table', $template));
+                       $this->parser->parse(listplug_batchlist('member', $resource, 'table', $template, $template_name));
                }
                else
                {
@@ -3330,7 +3330,7 @@ class AdminActions extends BaseActions
                                
                        $template['content'] = 'itemlist';
                                
-                       $this->parser->parse(listplug_navlist('item', $query, 'table', $template));
+                       $this->parser->parse(listplug_navlist('item', $query, 'table', $template, $template_name));
                }
                else
                {

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index 14b2929..38e3729 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -1046,9 +1046,9 @@ function listplug_table_itemlist($vars, $type, $template_name = '')
                                          . "</td>\n"\r
                                          . "<td<%cssclass%>>\n"\r
                                          . "<a href=\"index.php?action=itemedit&amp;itemid=<%itemid%>\"><%editbtn%></a><br />\n"\r
-                                         . "<%camount%>\n"\r
                                          . "<a href=\"index.php?action=itemmove&amp;itemid=<%itemid%>\"><%movebtn%></a><br />\n"\r
                                          . "<a href=\"index.php?action=itemdelete&amp;itemid=<%itemid%>\"><%delbtn%></a><br />\n"\r
+                                         . "<%camount%>\n"\r
                                          . "</td>\n";\r
                        }\r
                        else\r
@@ -2286,7 +2286,7 @@ function listplug_input_yesno($name, $checkedval, $tabindex = 0,
  * @param      string          $type   type for showlist()\r
  * @param      array           $vars   array for variables\r
  */\r
-function listplug_batchlist($attr, $query, $type, $vars)\r
+function listplug_batchlist($attr, $query, $type, $vars, $template_name)\r
 {\r
        global $manager;\r
        \r
@@ -2294,7 +2294,7 @@ function listplug_batchlist($attr, $query, $type, $vars)
        $content = "<form method=\"post\" action=\"index.php\">\n";\r
        \r
        /* BODY */\r
-       $content .= showlist($query, $type, $vars);\r
+       $content .= showlist($query, $type, $vars, $template_name);\r
        \r
        /* FOOT */\r
        switch ( $attr )\r
@@ -2371,12 +2371,14 @@ function listplug_batchlist($attr, $query, $type, $vars)
 /**\r
  * listplug_navlist()\r
  * \r
- * @param      string          $attr   item/member/team/category/comment\r
- * @param      resource        $query  SQL resorce\r
- * @param      string          $type   type for showlist()\r
- * @param      array           $vars   array for variables\r
+ * @param      string          $attr                   item/member/team/category/comment\r
+ * @param      resource        $query                  SQL resorce\r
+ * @param      string          $type                   type for showlist()\r
+ * @param      array           $vars                   array for variables\r
+ * @param      string          $template_name  name of template\r
+ * @return     string          contents\r
  */\r
-function listplug_navlist($attribute, $query, $type, $vars)\r
+function listplug_navlist($attribute, $query, $type, $vars, $template_name)\r
 {\r
        global $CONF;\r
        \r
@@ -2441,7 +2443,7 @@ function listplug_navlist($attribute, $query, $type, $vars)
        $template = $navi;\r
        \r
        /* BODY */\r
-       $template .= listplug_batchlist($attribute, $query, $type, $vars);\r
+       $template .= listplug_batchlist($attribute, $query, $type, $vars, $template_name);\r
        \r
        /* FOOT */\r
        $template .= $navi;\r