Projet

Général

Profil

Révision 7fe061e8

Ajouté par Assos Assos il y a plus de 8 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ds/includes/ds.field_ui.inc
774 774
    if (isset($form_state['values']['additional_settings']['preview']['info']['settings']['disable_css'])) {
775 775
      $record->settings['layout_disable_css'] = $form_state['values']['additional_settings']['preview']['info']['settings']['disable_css'];
776 776
    }
777
    else {
778
      $record->settings['layout_disable_css'] = FALSE;
779
    }
777 780

  
778 781
    $record->settings = $record->settings;
779 782

  
......
1759 1762
      if ($classes_access) {
1760 1763
        $form['additional_settings']['ds_classes']['info'] = array('#markup' => l(t('Manage region  and field CSS classes'), 'admin/structure/ds/classes', array('query' => drupal_get_destination())));
1761 1764
      }
1765
      elseif (user_access('admin_classes')) {
1766
        $form['additional_settings']['ds_classes']['info'] = array('#markup' => l(t('To manage region and field CSS classes, the Display Suite UI module should be enabled.'), 'admin/modules', array('query' => drupal_get_destination(), 'fragment' => 'edit-modules-display-suite')));
1767
      }
1762 1768
    }
1763 1769
    else {
1764 1770
      if ($classes_access) {
......
1894 1900

  
1895 1901
      $suggestions_array[0] = $layout_string . '--' . $entity_type;
1896 1902
      $suggestions_array[2] = $layout_string . '--' . $entity_type . '-' . $bundle;
1903
      $suggestions_array[4] = $layout_string . '--' . $entity_type . '--{id}';
1897 1904
      if (!isset($form_state['no_view_mode_suggestions']) && $view_mode != 'default') {
1898 1905
        $suggestions_array[1] = $layout_string . '--' . $entity_type . '-' . $view_mode;
1899 1906
        $suggestions_array[3] = $layout_string . '--' . $entity_type . '-' . $bundle . '-' . $view_mode;
......
1936 1943
        if (isset($layout->settings['layout_disable_css'])) {
1937 1944
          $disable_css = $layout->settings['layout_disable_css'];
1938 1945
        }
1939
        if (isset($form_state['values']) && $disable_css !== $form_state['values']['additional_settings']['ds_layouts']['preview']['info']['settings']['disable_css']) {
1940
          $disable_css = $form_state['values']['additional_settings']['ds_layouts']['preview']['info']['settings']['disable_css'];
1941
        }
1942 1946

  
1943 1947
        $form['additional_settings']['ds_layouts']['preview']['info']['settings']['disable_css'] = array(
1944 1948
          '#type' => 'checkbox',

Formats disponibles : Unified diff