';
- if ($form['#render title']) {
+ if ($element['#render title']) {
$output .= '
';
}
- foreach ($form['#value'] as $group) {
+ foreach ($element['#value'] as $group) {
$links = array();
foreach ($group as $key => $link) {
$links[] = "
{$link['title']}";
@@ -255,45 +251,58 @@ function theme_workflow_fields_shortcuts($form) {
function workflow_fields_state_form_submit($form, &$form_state) {
if (isset($form_state['values']['fields'])) {
if (!isset($form_state['values']['sid'])) {
- $form_state['values']['sid'] = db_result(db_query("SELECT sid FROM {workflow_states} WHERE wid = %d AND state = '%s'",
- $form_state['values']['wid'], $form_state['values']['state']));
+ $state = workflow_get_workflow_states_by_wid_state(
+ $form_state['values']['wid'], $form_state['values']['state']);
+ }
+ else {
+ $state = workflow_get_workflow_states_by_sid($form_state['values']['sid']);
}
- db_query("DELETE FROM {workflow_fields} WHERE sid = %d", intval($form_state['values']['sid']));
+ db_delete('workflow_fields')->condition('sid', $state->sid)->execute();
+ $insert = db_insert('workflow_fields')
+ ->fields(array('sid', 'name', 'type', 'visible_roles', 'editable_roles'));
foreach ($form_state['values']['fields'] as $type => $fields) {
foreach ($fields as $name => $field) {
$visible = array_filter($field['visible']);
$editable = array_filter($field['editable']);
- db_query("INSERT INTO {workflow_fields} (sid, name, type, visible_roles, editable_roles) VALUES(%d, '%s', '%s', '%s', '%s')",
- $form_state['values']['sid'], $name, $type, implode(',', $visible), implode(',', $editable)
- );
+ $insert->values(array(
+ 'sid' => $state->sid,
+ 'name' => $name,
+ 'type' => $type,
+ 'visible_roles' => implode(',', $visible),
+ 'editable_roles' => implode(',', $editable),
+ ));
}
}
+ $insert->execute();
}
}
/**
- * Helper function to alter the node form by hiding/disabling fields depending on the workflow state.
+ * Implementation of hook_form_BASE_FORM_ID_alter().
*/
-function _workflow_fields_node_form_alter(&$form, $form_state, $form_id) {
- $node = $form['#node'];
+function workflow_fields_form_node_form_alter(&$form, $form_state, $form_id) {
+ $node =& $form['#node'];
$sid = workflow_node_current_state($node);
if (!is_numeric($sid)) {
- $sid = db_result(db_query("SELECT sid FROM {workflow_states} ws
- LEFT JOIN {workflow_type_map} wtm ON ws.wid = wtm.wid
- WHERE wtm.type = '%s' AND ws.sysid = %d", $node->type, WORKFLOW_CREATION));
+ $type_map = workflow_get_workflow_type_map_by_type($node->type);
+ if (!$type_map) {
+ return;
+ }
+ $sid = workflow_get_creation_state_by_wid($type_map->wid);
}
// Check for visible/editable flags.
- $content = content_types($node->type);
- $fields = _workflow_fields_get_extra_fields($node->type) + $content['fields'];
+ $fields = _workflow_fields_get_fields($node->type);
$form['sid'] = array('#type' => 'value', '#value' => $sid);
list($visibles, $editables) = _workflow_fields_compute_permissions($sid, $node->type, $node, 'edit');
- if ($visibles) foreach ($visibles as $field_name => $visible) {
- if (!isset($fields[$field_name])) continue;
-
+ foreach ($visibles as $field_name => $visible) {
$editable = $editables[$field_name];
- if ($editable && $visible) continue;
-
+
+ if (!isset($fields[$field_name])) {
+ continue;
+ }
+ else
+
// Find the path to the field in the form.
$field = $fields[$field_name];
if (!empty($field['path'])) {
@@ -303,63 +312,49 @@ function _workflow_fields_node_form_alter(&$form, $form_state, $form_id) {
}
}
else {
- $path = _workflow_fields_array_key_path($field_name, $form, array('#field_info'));
+ $path = _workflow_fields_array_key_path($field_name, $form, array('#group_children'));
}
- if ($path === FALSE) continue;
-
- // Render the form for viewing.
- $node =& $form['#node'];
- if (!isset($node->content)) {
- $node = node_build_content($node, FALSE, TRUE);
+ if ($path === FALSE) {
+ continue;
+ }
+
+ if ($editable && $visible) {
+ if (isset($field['widget']['weight'])) {
+ $element =& _workflow_fields_array_path($form, $path);
+ $element['#weight'] = $field['widget']['weight'];
+ }
+ continue;
}
// Process the field.
if (isset($field['process'])) { // Does the field need special handling?
- call_user_func_array($field['process'], array(&$form, $field, $path, $visible, $editable, isset($field['process arguments']) ? (array)$field['process arguments'] : array()));
+ call_user_func_array($field['process'], array(&$form, $field, $path, $node, $visible, $editable, isset($field['process arguments']) ? (array)$field['process arguments'] : array()));
}
else { // Standard handling
- _workflow_fields_process_field($form, $field, $path, $visible, $editable);
- }
-
- // Hide empty fieldsets.
- if (count($path) > 1) {
- _workflow_fields_hide_empty_fieldsets($form[$path[0]]);
+ _workflow_fields_process_field($form, $field, $path, $node, $visible, $editable);
}
}
}
-function _workflow_fields_hide_empty_fieldsets(&$parent) {
- foreach (element_children($parent) as $child) {
- $element =& $parent[$child];
- if (isset($element['#type']) && (!isset($element['#access']) || $element['#access'])) return FALSE;
- if (!_workflow_fields_hide_empty_fieldsets($element)) return FALSE;
- }
- // If we reach here, then all children are empty.
- if (isset($parent['#type']) && $parent['#type'] == 'fieldset') {
- $parent['#access'] = FALSE;
- }
- return TRUE;
-}
-
-function _workflow_fields_process_field(&$form, $field, $path, $visible, $editable) {
+function _workflow_fields_process_field(&$form, $field, $path, $node, $visible, $editable) {
$element =& _workflow_fields_array_path($form, $path);
$parent =& _workflow_fields_array_path($form, array_slice($path, 0, -1));
if ($visible) { // Show the read-only version of the field
- if (!isset($field['extra'])) { // Is this a CCK field?
+ if (!isset($field['extra'])) { // Normal field
$parent[$field['field_name'] .'_view'] = array(
- '#type' => 'markup',
- '#value' => content_view_field($field, $form['#node'], FALSE, TRUE),
- '#weight' => isset($element['#weight']) ? $element['#weight'] : $form['#field_info'][$field['field_name']]['widget']['weight'],
+ '#type' => 'item',
+ '#title' => isset($element['#title']) ? $element['#title'] : '',
+ '#markup' => drupal_render(field_view_field('node', $node, $field['field_name'])),
+ '#weight' => isset($field['widget']['weight']) ? $field['widget']['weight'] : 0,
);
- }
- else { // Non-CCK
- $node = $form['#node'];
- if (_workflow_fields_array_path_exists($node->content, $path)) {
- $view = _workflow_fields_array_path($node->content, $path);
- $parent[$field['field_name'] .'_view'] = $view;
+ if (isset($form['#group_children'][$field['field_name']])) {
+ $form['#group_children'][$field['field_name'].'_view']
+ = $form['#group_children'][$field['field_name']];
}
}
+ // If non field, visible but not editable... you should define process.
+
if (isset($parent['#type']) && $parent['#type'] == 'fieldset') {
$parent['#access'] = TRUE; // #access of parent can be set to FALSE when all fields are disabled (by hook_field_access)
}
@@ -369,10 +364,22 @@ function _workflow_fields_process_field(&$form, $field, $path, $visible, $editab
$element['#access'] = FALSE;
}
+function _workflow_fields_show_title(&$form, $field, $path, $node, $visible, $editable, $args) {
+ $element =& _workflow_fields_array_path($form, $path);
+ $parent =& _workflow_fields_array_path($form, array_slice($path, 0, -1));
+ $element['#access'] = FALSE;
+ $parent['title_view'] = array(
+ '#type' => 'item',
+ '#title' => isset($element['#title']) ? $element['#title'] : '',
+ '#markup' => check_plain($node->title),
+ '#weight' => isset($element['#weight']) ? $element['#weight'] : 0,
+ );
+}
+
/**
* Implementation of hook_workflow_fields().
*
- * Used to describe non-CCK fields to be handled during form rendering.
+ * Used to describe non-fields to be handled during form rendering.
*
* @param $type
* Content type being handled.
@@ -383,35 +390,20 @@ function _workflow_fields_process_field(&$form, $field, $path, $visible, $editab
* 'path' (optional): explicit field path
* 'process' (optional): callback to handle hiding / read-only with signature process(&$form, $field, $path, $visible, $editable)
* 'process arguments' (optional): array of extra arguments to pass to callback
- *
*/
function workflow_fields_workflow_fields($type) {
- $content = node_get_types('type', $type);
+ $content = node_type_get_type($type);
$fields = array();
if ($content->has_title) {
$fields['title'] = array(
'label' => $content->title_label,
+ 'process' => '_workflow_fields_show_title',
);
}
- if ($content->has_body) {
- $fields['body'] = array(
- 'label' => $content->body_label,
- 'process' => '_workflow_fields_process_body',
- );
- }
- if (module_exists('taxonomy')) {
- $vocabularies = taxonomy_get_vocabularies($type);
- if (!empty($vocabularies)) foreach ($vocabularies as $vid => $vocabulary) {
- $fields['vid_' . $vid] = array(
- 'label' => $vocabulary->name,
- 'path' => $vocabulary->tags ? array('taxonomy', 'tags', $vid) : array('taxonomy', $vid),
- );
- }
- }
return $fields;
}
-function _workflow_fields_get_extra_fields($type, $reset = FALSE) {
+function _workflow_fields_get_fields($type, $reset = FALSE) {
static $fields = array();
if (!isset($fields[$type]) || $reset) {
$fields[$type] = module_invoke_all('workflow_fields', $type);
@@ -421,35 +413,27 @@ function _workflow_fields_get_extra_fields($type, $reset = FALSE) {
$fields[$type][$key]['extra'] = TRUE;
}
drupal_alter('workflow_fields', $fields, $type);
+ $fields[$type] += field_info_instances('node', $type);
}
return $fields[$type];
}
-function _workflow_fields_process_body(&$form, $field, $path, $visible, $editable, $arguments) {
- $form['body_field']['#access'] = FALSE;
- if ($visible) {
- $form['body'] = $form['#node']->content['body'];
- $form['body']['#weight'] = $form['#content_extra_fields']['body_field']['weight'];
- }
-}
-
/**
* Implementation of hook_workflow_operations().
*/
function workflow_fields_workflow_operations($mode, $wid, $sid=0) {
switch ($mode) {
- case 'workflow':
- break;
- case 'state':
- if (WORKFLOW_CREATION == db_result(db_query("SELECT sysid FROM {workflow_states} WHERE wid = %d AND sid = %d", $wid, $sid))) { // (creation) state
- return array(
- 'workflow_creation_edit' => array(
- 'title' => t('Edit'),
- 'href' => "admin/build/workflow/state/$wid/$sid",
- ),
- );
- }
- break;
+ case 'state':
+ $creation_sid = workflow_get_creation_state_by_wid($wid);
+ if ($sid == $creation_sid) { // (creation) state
+ return array(
+ 'workflow_creation_edit' => array(
+ 'title' => t('Edit'),
+ 'href' => "admin/config/workflow/workflow/state/$wid/$sid",
+ ),
+ );
+ }
+ break;
}
}
@@ -457,7 +441,7 @@ function workflow_fields_workflow_operations($mode, $wid, $sid=0) {
* Implementation of hook_menu().
*/
function workflow_fields_menu() {
- $items['admin/settings/workflow_fields'] = array(
+ $items['admin/config/workflow/workflow_fields'] = array(
'title' => 'Workflow Fields settings',
'description' => 'Global settings for the behaviour of Workflow Fields.',
'page callback' => 'drupal_get_form',
@@ -492,16 +476,6 @@ function _workflow_fields_compute_groups($node = NULL) {
if ($user->uid == $node->uid) {
$groups[] = FIELD_ROLE_AUTHOR;
}
- $content = content_types($node->type);
- foreach ($content['fields'] as $name => $field) {
- if ($field['type'] == 'userreference' && isset($node->$name)) {
- foreach ($node->$name as $uid) {
- if ($uid['uid'] === $user->uid) {
- $groups[] = $name;
- }
- }
- }
- }
}
return $groups;
}
@@ -510,22 +484,26 @@ function _workflow_fields_compute_permissions($sid, $type, $node, $op) {
$visibles = array();
$editables = array();
$groups = _workflow_fields_compute_groups($node);
- $result = db_query("SELECT name, visible_roles, editable_roles FROM {workflow_fields} WHERE sid = %d AND type = '%s'", $sid, $type);
- global $user;
- while ($row = db_fetch_array($result)) {
- $visible_roles = explode(',', $row['visible_roles']);
- $editable_roles = explode(',', $row['editable_roles']);
- $visibles[$row['name']] = user_access('bypass field restrictions') || (bool)array_intersect($groups, $visible_roles);
- $editables[$row['name']] = user_access('bypass field restrictions') || (bool)array_intersect($groups, $editable_roles);
+ $result = db_query(
+ "SELECT name, visible_roles, editable_roles
+ FROM {workflow_fields} WHERE sid = :sid AND type = :type",
+ array(':sid' => $sid, ':type' => $type)
+ );
+
+ foreach ($result as $row) {
+ $visible_roles = explode(',', $row->visible_roles);
+ $editable_roles = explode(',', $row->editable_roles);
+ $visibles[$row->name] = user_access('bypass field restrictions') || (bool)array_intersect($groups, $visible_roles);
+ $editables[$row->name] = user_access('bypass field restrictions') || (bool)array_intersect($groups, $editable_roles);
if ($op == 'edit') {
- if (variable_get('workflow_fields_hide_read_only_when_editing', FALSE) && !$editables[$row['name']]) {
- $visibles[$row['name']] = FALSE;
+ if (variable_get('workflow_fields_hide_read_only_when_editing', FALSE) && !$editables[$row->name]) {
+ $visibles[$row->name] = FALSE;
}
- if (variable_get('workflow_fields_edit_invisible_when_editing', TRUE) && $editables[$row['name']]) {
- $visibles[$row['name']] = TRUE;
+ if (variable_get('workflow_fields_edit_invisible_when_editing', TRUE) && $editables[$row->name]) {
+ $visibles[$row->name] = TRUE;
}
- if (!$visibles[$row['name']]) {
- $editables[$row['name']] = FALSE;
+ if (!$visibles[$row->name]) {
+ $editables[$row->name] = FALSE;
}
}
}
@@ -567,21 +545,21 @@ function _workflow_fields_array_path_exists($array, $path) {
/**
* Implementation of hook_field_access().
*/
-function workflow_fields_field_access($op, $field, $account = NULL, $node = NULL) {
- if (!$node) return TRUE;
- $node = node_load($node->nid); // The node object can be a views result object too: not good
+function workflow_fields_field_access($op, $field, $entity_type, $node, $account) {
+ if ($entity_type == 'node' || !$node) {
+ $sid = workflow_node_current_state($node);
+ if (!$sid) return TRUE;
+ if (!is_numeric($sid)) {
+ $type_map = workflow_get_workflow_type_map_by_type($node->type);
+ $sid = workflow_get_creation_state_by_wid($type_map->wid);
+ }
- $sid = workflow_node_current_state($node);
- if (!$sid) return TRUE;
- if (!is_numeric($sid)) {
- $sid = db_result(db_query("SELECT sid FROM {workflow_states} ws
- LEFT JOIN {workflow_type_map} wtm ON ws.wid = wtm.wid
- WHERE wtm.type = '%s' AND ws.sysid = %d", $node->type, WORKFLOW_CREATION));
+ // Check for visible/editable flags.
+ list($visibles, $editables) = _workflow_fields_compute_permissions($sid, $node->type, $node, $op);
+ if (!isset($visibles[$field['field_name']])) return TRUE;
+ return ($op == 'view') ? $visibles[$field['field_name']] : ($visibles[$field['field_name']] && $editables[$field['field_name']]);
+ }
+ else {
+ return TRUE;
}
-
- // Check for visible/editable flags.
- list($visibles, $editables) = _workflow_fields_compute_permissions($sid, $node->type, $node, $op);
- if (!isset($visibles[$field['field_name']])) return TRUE;
- return ($op == 'view') ? $visibles[$field['field_name']] : ($visibles[$field['field_name']] && $editables[$field['field_name']]);
}
-