Merge lp:~edb/quam-plures/navbar_workflow_fix into lp:quam-plures

[EdB]

Removes a tiny little "bug": when workflow is not enabled we still get a navbar option for "post statuses", but that feature only comes into play when workflow is enabled. This branch does a check before adding that option to the navbar.

[Yabs (yabs)]

if( $Blog

Needs to be :

if( !empty( $Blog )

Although, ideally, we'd actually check if it was an instance of the blog class, which we don't do anywhere in the core AFAIK.

¥

review: Needs Fixing

[EdB (edb)]

if( $Blog ) { die() }
produces the same exact results as
if( ! empty( $Blog ) { die() }

In both cases it doesn't die until a blog has been selected or identified ... even if it seems to be blog-0 in the URL. For example when first hitting the Items or Blog settings tab. The URL in those cases says blog 0 but it actually goes to the first blog or blog 1.

So why would the latter be more correct than the former?

[Yabs (yabs)]

If $Blog isn't defined and you check with "if( $Blog )" it'll throw a php warning about an undefined variable, whereas !empty( $Blog ) won't.

¥

[lp:~edb/quam-plures/navbar_workflow_fix]

7581. By EdB on 2011-01-15

updated from core

7582. By EdB on 2011-01-16

update from core

[EdB (edb)]

Okay got it figured out. It isn't empty, but it is "defined" compliments of the global line declaring it's existence.
if( $Blog ) { pre_dump( $Blog ); } before the block of globals at function build_navbar_menu() throws an error for undefined variable. Anywhere after those globals it doesn't. Same with little-b $blog - error above, no error below.

It works as-is is the thing.

[lp:~edb/quam-plures/navbar_workflow_fix]

7583. By EdB on 2011-02-04

update from core

7584. By EdB on 2011-02-20

adding core changes

[Yabs (yabs)]

Fair enough ;)

¥

review: Approve

[lp:~edb/quam-plures/navbar_workflow_fix]

7585. By EdB on 2011-03-08

new stuff in core now here - woohoo!

=== modified file 'qp_inc/_core/__core.init.php'
--- qp_inc/_core/__core.init.php	2011-01-01 12:53:50 +0000
+++ qp_inc/_core/__core.init.php	2011-03-08 04:37:11 +0000
@@ -408,11 +408,18 @@
 					'text' => T_('Post types').'…',
 					'href' => $admin_url.'?ctrl=itemtypes',
 				),
-				'itemstatuses' => array(
-					'text' => T_('Post statuses').'…',
-					'href' => $admin_url.'?ctrl=itemstatuses',
-				),
 			);
+
+			if( $Blog && $Blog->get_setting( 'use_workflow' ) )
+			{ // workflow is enabled for this blog
+				$entries['global_sets']['entries'] += array(
+					'itemstatuses' => array(
+						'text' => T_('Post statuses').'…',
+						'href' => $admin_url.'?ctrl=itemstatuses',
+					),
+				);
+			}
+
 		}
 
 		// FILES LINK :: main item update and dropdown menu items...
@@ -989,13 +996,19 @@
 								'text' => T_('Post types'),
 								'title' => T_('Post types management'),
 								'href' => $dispatcher.'?ctrl=itemtypes'),
-							'statuses' => array(
-								'text' => T_('Post statuses'),
-								'title' => T_('Post statuses management'),
-								'href' => $dispatcher.'?ctrl=itemstatuses'),
-							)
-						),
-					) );
+						)
+					),
+			) );
+
+			if( $Blog && $Blog->get_setting( 'use_workflow' ) )
+			{
+				$AdminUI->add_menu_entries( 'options', array(
+						'statuses' => array(
+							'text' => T_('Post statuses'),
+							'title' => T_('Post statuses management'),
+							'href' => $dispatcher.'?ctrl=itemstatuses' ),
+				) );
+			}
 		}
 
 		if( $current_User->check_perm( 'users', 'view' ) )