Commit 5cd76fbc authored by Joachim Noreiko's avatar Joachim Noreiko 💬 Committed by Peter Philipp
Browse files

Issue #2536386 by joachim: 'node' variable in page.tpl shows the published node on node/XX/draft

parent 82c74ba1
Loading
Loading
Loading
Loading
+23 −3
Changes for workbench_moderation.module: 23 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ function workbench_moderation_menu() {
  $items = array();

  // View the current draft of a node.
  $items["node/%node/draft"] = array(
  $items["node/%workbench_moderation_node_current_draft/draft"] = array(
    'title' => 'View draft',
    'page callback' => 'workbench_moderation_node_view_draft',
    'page arguments' => array(1),
@@ -28,21 +28,41 @@ function workbench_moderation_menu() {
    'file' => 'workbench_moderation.node.inc',
    'type' => MENU_LOCAL_TASK,
    'weight' => -9,
    'tab_parent' => 'node/%',
    'tab_root' => 'node/%',
  );

  return $items;
}

/**
 * Replacement menu loader for viewing a current draft node.
 *
 * This ensures that page.tpl gets the correct version of the node.
 *
 * @param int $nid
 *   The node ID.
 *
 * @return object
 *   The current node according to moderation.
 */
function workbench_moderation_node_current_draft_load($nid) {
  $node = node_load($nid);
  // Get draft node.
  $draft_node = state_flow_entity_get_active_revision($node, 'node');
  return $draft_node;
}

/**
 * Checks if the user can view the current node revision.
 *
 * This is the access callback for node/%node/draft as defined in
 * workbench_moderation_menu().
 *
 * @param $node
 * @param int $node
 *   The node being acted upon.
 *
 * @return
 * @return bool
 *   Booelan TRUE or FALSE.
 */
function _workbench_moderation_access_current_draft($node) {