Merge pull request #14 from amcgowanca/7.x-1.x

Updated contributed modules, added Date API default time for scheduler.

Author: Aaron McGowan

drupal-org.make

@@ -9,10 +9,10 @@ projects[entity][subdir] = "contrib"
 projects[entity][version] = "1.1"
 projects[rules][type] = "module"
 projects[rules][subdir] = "contrib"
-projects[rules][version] = "2.3"
+projects[rules][version] = "2.6"
 projects[scheduler][type] = "module"
 projects[scheduler][subdir] = "contrib"
-projects[scheduler][version] = "1.1"
+projects[scheduler][version] = "1.2"
 projects[strongarm][type] = "module"
 projects[strongarm][subdir] = "contrib"
 projects[strongarm][version] = "2.0"
@@ -31,6 +31,7 @@ projects[workbench_moderation][version] = "1.3"
 projects[workbench_moderation][subdir] = "contrib"
 projects[workbench_moderation][patch][] = "https://raw.github.com/imagex/imagex_patches/7.x/contrib/workbench_moderation/1314508-workbench-moderation-features.patch"
 projects[workbench_moderation][patch][] = "https://raw.github.com/imagex/imagex_patches/7.x/contrib/workbench_moderation/workbench_moderation-entitymalformed-1919706-3.patch"
+projects[workbench_moderation][patch][] = "https://raw2.github.com/imagex/imagex_patches/7.x/contrib/workbench_moderation/workbench_moderation-normalize-workbench_moderation-element-of-node-on-update.patch"
 projects[workbench_moderation_notes][type] = "module"
 projects[workbench_moderation_notes][version] = "1.x-dev"
 projects[workbench_moderation_notes][subdir] = "contrib"

imagex_workflow.info

@@ -2,7 +2,7 @@ name = Workflow
 description = This component enables content moderation and workflow by leveraging the Workbench Suite of Modules.
 core = 7.x
 package = ImageX
-version = 7.x-1.0
+version = 7.x-1.x
 project = imagex_workflow
 dependencies[] = ctools
 dependencies[] = entity

imagex_workflow.module

@@ -12,3 +12,19 @@ include_once 'imagex_workflow.features.inc';
 // presents a warning due to `$defaults` equalling false.
 include_once 'imagex_workflow.features.workbench_moderation_states.inc';
 include_once 'imagex_workflow.features.workbench_moderation_transitions.inc';
+
+/**
+ * Implements hook_date_popup_pre_validate_alter().
+ *
+ * Assists in providing a default time for scheduler's publish_on and unpublish_on
+ * fields should only a date be presented. The date_popup api will present a form error
+ * should only the date be present and not the time during validation.
+ */
+function imagex_workflow_date_popup_pre_validate_alter(&$element, &$form_state, &$input) {
+  if (in_array($element['#name'], array('publish_on', 'unpublish_on')) && isset($form_state['values'][$element['#name']])) {
+    if (!empty($form_state['values'][$element['#name']]['date']) && empty($form_state['values'][$element['#name']]['time'])) {
+      $form_state['values'][$element['#name']]['time'] = '00:00:00';
+    }
+    $input = $form_state['values'][$element['#name']];
+  }
+}