<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2824] sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt: WordCamp Post Type: Soft-enforce a post status progression for WordCamps via the UI.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/2824">2824</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/2824","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-28 17:11:35 +0000 (Mon, 28 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Post Type: Soft-enforce a post status progression for WordCamps via the UI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptviewswordcampmetaboxstatusphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptviewswordcampmetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php 2016-03-28 16:52:01 UTC (rev 2823)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php 2016-03-28 17:11:35 UTC (rev 2824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,9 +11,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="post-status-display">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="post_status">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $transitions = WordCamp_Loader::get_valid_status_transitions( $post->post_status ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( WordCamp_Loader::get_post_statuses() as $key => $label ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $status = get_post_status_object( $key ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="<?php echo esc_attr( $status->name ); ?>" <?php selected( $post->post_status, $status->name ); ?> >
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="<?php echo esc_attr( $status->name ); ?>" <?php
+ if ( $post->post_status == $status->name ) {
+ selected( true );
+ } elseif ( ! in_array( $status->name, $transitions ) ) {
+ echo ' disabled ';
+ }
+ ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $status->label ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-03-28 16:52:01 UTC (rev 2823)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-03-28 17:11:35 UTC (rev 2824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', array( $this, 'log_status_changes' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wcpt_added_to_planning_schedule', array( $this, 'add_organizer_to_central' ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wcpt_added_to_planning_schedule', array( $this, 'mark_date_added_to_planning_schedule' ), 10 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wp_insert_post_data', array( $this, 'enforce_post_status_progression' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wp_insert_post_data', array( $this, 'enforce_post_status' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_insert_post_data', array( $this, 'require_complete_meta_to_publish_wordcamp' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Admin notices
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -694,13 +694,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Force WordCamp posts to go through the expected status progression.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enforce a valid post status for WordCamps.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_data
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_data_raw
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function enforce_post_status_progression( $post_data, $post_data_raw ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function enforce_post_status( $post_data, $post_data_raw ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $post_data['post_type'] != WCPT_POST_TYPE_ID || empty( $_POST['post_ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $post_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,22 +710,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $post_data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // @todo: Rewrite all of this according to the new flow.
- if ( ! empty( $_POST ) ) {
- $previous_post_status = get_post( absint( $_POST['post_ID'] ) );
- $previous_post_status = $previous_post_status->post_status;
-
- if ( 'pending' == $post_data['post_status'] && ! in_array( $previous_post_status, array( 'draft', 'pending', 'publish' ) ) ) {
- $this->active_admin_notices[] = 2;
- $post_data['post_status'] = $previous_post_status;
- }
-
- if ( 'publish' == $post_data['post_status'] && ! in_array( $previous_post_status, array( 'pending', 'publish' ) ) ) {
- $this->active_admin_notices[] = 2;
- $post_data['post_status'] = $previous_post_status;
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_data['post_status'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only network admins can change WordCamp statuses.
</span></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-03-28 16:52:01 UTC (rev 2823)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-03-28 17:11:35 UTC (rev 2824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,6 +116,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Get WordCamp post statuses.
+ *
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function get_post_statuses() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-formal-review' => _x( 'Formal Review', 'wordcamp status', 'wordcamporg' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,6 +141,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-budget-closed' => _x( 'Budget Closed', 'wordcamp status', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Return valid transitions given a post status.
+ *
+ * @param string $status Current status.
+ *
+ * @return array Valid transitions.
+ */
+ public static function get_valid_status_transitions( $status ) {
+ $transitions = array(
+ 'wcpt-formal-review' => array( 'wcpt-inactive', 'wcpt-application-rev' ),
+ 'wcpt-inactive' => array( 'wcpt-formal-review', 'wcpt-application-rev' ),
+ 'wcpt-application-rev' => array( 'wcpt-inactive', 'wcpt-scheduling' ),
+ 'wcpt-scheduling' => array( 'wcpt-inactive', 'wcpt-interview-sched', 'wcpt-application-rev' ),
+ 'wcpt-interview-sched' => array( 'wcpt-inactive', 'wcpt-needs-site', 'wcpt-scheduling', 'wcpt-rejected' ),
+ 'wcpt-needs-site' => array( 'wcpt-inactive', 'wcpt-agreement-sig', 'wcpt-interview-sched' ),
+ 'wcpt-rejected' => array( 'wcpt-inactive' ),
+ 'wcpt-agreement-sig' => array( 'wcpt-inactive', 'wcpt-site-created', 'wcpt-needs-site' ),
+ 'wcpt-site-created' => array( 'wcpt-inactive', 'wcpt-listing-added', 'wcpt-agreement-sig' ),
+ 'wcpt-listing-added' => array( 'wcpt-inactive', 'wcpt-needs-budget-re', 'wcpt-site-created' ),
+ 'wcpt-needs-budget-re' => array( 'wcpt-inactive', 'wcpt-budget-approved', 'wcpt-listing-added' ),
+ 'wcpt-budget-approved' => array( 'wcpt-inactive', 'wcpt-venue-signed', 'wcpt-needs-budget-re' ),
+ 'wcpt-venue-signed' => array( 'wcpt-inactive', 'wcpt-scheduled', 'wcpt-budget-approved' ),
+ 'wcpt-scheduled' => array( 'wcpt-inactive', 'wcpt-debrief', 'wcpt-venue-signed' ),
+ 'wcpt-debrief' => array( 'wcpt-inactive', 'wcpt-budget-closed', 'wcpt-scheduled' ),
+ 'wcpt-budget-closed' => array( 'wcpt-inactive', 'wcpt-debrief' ),
+ );
+
+ if ( empty( $transitions[ $status ] ) )
+ return array( 'wcpt-inactive', 'wcpt-formal-review' );
+
+ return $transitions[ $status ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // class_exists check
</span></span></pre>
</div>
</div>
</body>
</html>