Changeset 1177

Timestamp:

10/21/08 00:51:01 (17 months ago)

Author:

jallen

Message:

Fixed a number of issues:

• Testing for ->blog before using ->blog->id in order to avoid an error
• Fixed a lopsided comment in a script which cause Safari not to display the PQ manager page
• Removed an errant PhotoGallery CSS link
• Converted tabs to spaces and reflowed long lines

Location:

trunk/PQManager/plugins/PQManager

Files:

• lib/PQManager/Plugin.pm (modified) (6 diffs)
• tmpl/list.tmpl (modified) (2 diffs)

trunk/PQManager/plugins/PQManager/lib/PQManager/Plugin.pm

@@ -31 +31 @@
     my $q = $app->{query};
 
-    if ($app->blog->id) {
-        $app->redirect(
+    if (my $blog = $app->blog) {
+        $app->redirect(
             $app->uri(
                 'mode' => 'dashboard',
                 args   => {
-                    blog_id => $app->blog->id,
+                    blog_id => $blog->id,
                 }
             )
-            );
+        );
     }
 
@@ -55 +55 @@
     my $code = sub {
         my ($job, $row) = @_;
-        my $fi = MT::FileInfo->load({ id => $job->uniqkey });
-        $tmpls{$fi->template_id} = MT::Template->load({ id => $fi->template_id }) unless $tmpls{$fi->template_id};
-        my $tmpl = $tmpls{$fi->template_id};
-        $blogs{$tmpl->blog_id} = MT::Blog->load({ id => $tmpl->blog_id }) unless $blogs{$tmpl->blog_id};
-        my $blog = $blogs{$tmpl->blog_id};
-        $row->{'id'} = $job->jobid;
-        $row->{'priority'} = $job->priority;
-        $row->{'blog'} = $blog->name;
-        $row->{'template'} = $tmpl->name;
-        $row->{'path'} = $fi->file_path;
+        my $fi                   = MT::FileInfo->load({ id => $job->uniqkey });
+        $tmpls{$fi->template_id} = MT::Template->load({ id => $fi->template_id })
+                unless $tmpls{$fi->template_id};
+        my $tmpl                 = $tmpls{$fi->template_id};
+        $blogs{$tmpl->blog_id}   = MT::Blog->load({ id => $tmpl->blog_id })
+            unless $blogs{$tmpl->blog_id};
+        my $blog                 = $blogs{$tmpl->blog_id};
+        $row->{'id'}             = $job->jobid;
+        $row->{'priority'}       = $job->priority;
+        $row->{'blog'}           = $blog->name;
+        $row->{'template'}       = $tmpl->name;
+        $row->{'path'}           = $fi->file_path;
 #        my $ts = $row->{created_on};
 #        $row->{date} = relative_date($ts, time);
@@ -70 +72 @@
 
     require MT::TheSchwartz::FuncMap;
-    my $fm = MT::TheSchwartz::FuncMap->load( { funcname => 'MT::Worker::Publish' } );
+    my $fm = MT::TheSchwartz::FuncMap->load(
+        {funcname => 'MT::Worker::Publish'});
 
     # %terms is used in case you want to filter the query that will fetch
@@ -76 +79 @@
     # being rendered to the screen
     my %terms = (
-                 funcid => $fm->funcid,
-                 );
+         funcid => $fm->funcid,
+         );
 
     # %args is used in case you want to sort or otherwise modify the 
@@ -85 +88 @@
     my $clause = ' = ts_job_uniqkey';
     my %args = (
-                sort => 'priority',
-                direction => 'descend',
-                join => MT::FileInfo->join_on( undef, { id => \$clause }),
-                );
+        sort => 'priority',
+        direction => 'descend',
+        join => MT::FileInfo->join_on( undef, { id => \$clause }),
+        );
 
     # %params is an addition hash of input parameters into the template
@@ -94 +97 @@
     # can be displayed in your template.
     my %params = (
-        deleted => $q->param('deleted'),
-        );
+        deleted => $q->param('deleted'),
+    );
 
     # Fetch an instance of the current plugin using the plugin's key.

trunk/PQManager/plugins/PQManager/tmpl/list.tmpl

@@ -2 +2 @@
 
 <mt:setvarblock name="html_head" append="1">
-  <script type="text/javascript"><!--
+  <script type="text/javascript">
+    /* <![CDATA[ */
     var tableSelect;
     function init() {
@@ -14 +15 @@
       doRemoveItems(getByID('ts_job-listing-form'), 'job', 'jobs', 'id', new Array(), params );
     }
+    /* ]]> */
   </script>
-  <link rel="stylesheet" href="<mt:StaticWebPath>plugins/PhotoGallery/app/styles.css" type="text/css" /></head>
-
 </mt:setvarblock>