Changeset 1772

Timestamp:

04/04/08 20:05:22 (23 months ago)

Author:

bchoate

Message:

Fixed itemset actions to work for template listing screen. BugId:74595

Location:

branches/release-33

Files:

• lib/MT/Template/ContextHandlers.pm (modified) (7 diffs)
• tmpl/cms/include/itemset_action_widget.tmpl (modified) (1 diff)

branches/release-33/lib/MT/Template/ContextHandlers.pm

@@ -931 +931 @@
     my $actions_top = "";
     my $actions_bottom = "";
+    my $form_id = "$id-form";
     if ($show_actions) {
-        $actions_top = qq{<\$MTApp:ActionBar bar_position="top" hide_pager="$hide_pager"\$>};
-        $actions_bottom = qq{<\$MTApp:ActionBar bar_position="bottom" hide_pager="$hide_pager"\$>};
+        $actions_top = qq{<\$MTApp:ActionBar bar_position="top" hide_pager="$hide_pager" form_id="$form_id"\$>};
+        $actions_bottom = qq{<\$MTApp:ActionBar bar_position="bottom" hide_pager="$hide_pager" form_id="$form_id"\$>};
     } else {
         $listing_class .= " hide_actions";
@@ -959 +960 @@
         $listing_header
     </div>
-    <form id="$id-form" class="listing-form"
+    <form id="$form_id" class="listing-form"
         action="$action" method="post"
         onsubmit="return this['__mode'] ? true : false">
@@ -1006 +1007 @@
     my ($ctx, $args, $cond) = @_;
     my $pos = $args->{bar_position} || 'top';
+    my $form_id = $args->{form_id} ? qq{ form_id="$args->{form_id}"} : "";
     my $pager = $args->{hide_pager} ? ''
         : qq{\n        <mt:include name="include/pagination.tmpl" bar_position="$pos">};
@@ -1014 +1016 @@
         <span class="button-actions actions">$buttons</span>
         <span class="plugin-actions actions">
-    <mt:include name="include/itemset_action_widget.tmpl">
+    <mt:include name="include/itemset_action_widget.tmpl"$form_id>
         </span>
     </div>
@@ -1329 +1331 @@
         my $res = $builder->build($ctx, $tokens, $cond);
         return $ctx->error($builder->errstr) unless defined $res;
-        $out .= $glue if $cnt > 1;
-        $out .= $res;
-        $cnt++;
+        if ($res ne '') {
+            $out .= $glue if $cnt > 1;
+            $out .= $res;
+            $cnt++;
+        }
     }
     return $out;
@@ -1603 +1607 @@
         my $res = $builder->build($ctx, $tokens, $cond);
         return $ctx->error($builder->errstr) unless defined $res;
-        $out .= $glue if $i > 1;
-        $out .= $res;
-        $i++;
+        if ($res ne '') {
+            $out .= $glue if $i > 1;
+            $out .= $res;
+            $i++;
+        }
     }
     return $out;
@@ -4706 +4712 @@
         defined(my $out = $builder->build($ctx, $tokens, $cond))
             or return $ctx->error( $builder->errstr );
-        push @res, $out;
+        push @res, $out if $out ne '';
     }
     my $sep = $args->{glue} || '';

branches/release-33/tmpl/cms/include/itemset_action_widget.tmpl

@@ -25 +25 @@
 </select>
 </div>
-<a href="javascript:void(0)" class="small-button" onclick="doPluginAction(getByID('<$mt:var name="object_type"$>-listing-form'), '<mt:if name="object_label_plural"><mt:var name="object_label_plural" escape="js"></mt:if>', '<__trans phrase="to act upon" escape="js">'); return false;"><__trans phrase="Go"></a>
+<a href="javascript:void(0)" class="small-button" onclick="doPluginAction(getByID('<mt:if name="form_id"><mt:var name="form_id"><mt:else><$mt:var name="object_type"$>-listing-form</mt:if>'), '<mt:if name="object_label_plural"><mt:var name="object_label_plural" escape="js"></mt:if>', '<__trans phrase="to act upon" escape="js">'); return false;"><__trans phrase="Go"></a>
 </mt:if>