diff --git a/server/sites/all/modules/contrib_patched/token/token-2474403-1.patch b/server/sites/all/modules/contrib_patched/token/token-2474403-1.patch index 0bb60e9..0ad0707 100644 --- a/server/sites/all/modules/contrib_patched/token/token-2474403-1.patch +++ b/server/sites/all/modules/contrib_patched/token/token-2474403-1.patch @@ -8,13 +8,13 @@ index b683c70..c91f214 100644 if (!empty($element['#description']) && !empty($context['instance']['description'])) { - $element['#description'] = filter_xss_admin(token_replace($context['instance']['description'])); + // I18N only translates $element['#description'] and not the original instance. -+ if (module_enable('i18n_field')) { ++ if (module_enable(array('i18n_field'))) { + $instance = i18n_string_object_translate('field_instance', $context['instance']); + } + else { + $instance = $context['instance']['description']; + } -+ $element['#description'] = filter_xss_admin(token_replace($instance)); ++ $element['#description'] = filter_xss_admin(token_replace($instance['description'])); } } diff --git a/server/sites/all/modules/custom/kcampaigns/kcampaigns.module b/server/sites/all/modules/custom/kcampaigns/kcampaigns.module index 8f14379..1f80d60 100644 --- a/server/sites/all/modules/custom/kcampaigns/kcampaigns.module +++ b/server/sites/all/modules/custom/kcampaigns/kcampaigns.module @@ -216,8 +216,13 @@ function kcampaigns_node_form_kcampaigns_access(&$form, &$form_state, $form_id) } } } + } + + + + // DENY ACCESS IF START DATE OF CAMPAIGN IS REACHED and is not on // campaign edition. if ($user->uid != 1 && $form_state['storage']['campaign_edit'] == FALSE) { @@ -609,6 +614,14 @@ function kcampaigns_form_campaign_node_form_alter_step_index_0(&$form, &$form_st } // Handle default values and hide times if necessary $form['field_campaign_period'][$form_language][0]['#after_build'] = array('kcampaigns_datepicker_after'); + + // User is not saas + //************************************ + //************************************ + //************************************ + if (!kuser_has_role(array(KUSER_IS_SAAS))) { + $form['field_campaign_period']['und'][0]['#description'] .= ' ' . t('AbadaCadabra The minimum duration of a campaign is 7 days.'); + } } /** @@ -944,6 +957,7 @@ function kcampaigns_node_submit($node, $form, &$form_state) { } // set the manufacturer id for non-saas users + if (!kuser_has_role(array(KUSER_IS_SAAS))) { // Get values of our node field $field_brand = field_get_items('node', $node, 'field_brand'); diff --git a/server/sites/all/profiles/kairionprofile/translations/de.po b/server/sites/all/profiles/kairionprofile/translations/de.po index 1096b1a..2313750 100644 --- a/server/sites/all/profiles/kairionprofile/translations/de.po +++ b/server/sites/all/profiles/kairionprofile/translations/de.po @@ -3670,7 +3670,7 @@ msgid "Kairion Template" msgstr "" msgid "Campaign period must be at least 1 week long." -msgstr "Bitte wählen Sie als Kampagnenzeitraum eine Periode von mindestens einer Woche." +msgstr "Bitte wählen Sie als eine Periode von mindestens einer Woche." msgid "Select at least one category for purchase history targeting" msgstr "Bitte wählen Sie mindestens eine Kategorie für das Kauf-Historien-Targeting aus"