Projet

Général

Profil

Révision c22e192e

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ctools/page_manager/plugins/task_handlers/http_response.inc
216 216
 * General settings for the panel
217 217
 */
218 218
function page_manager_http_response_edit_settings($form, &$form_state) {
219
  ctools_include('page_manager.admin', 'page_manager', '');
220
  ctools_include('export', 'ctools');
221

  
219 222
  $conf = $form_state['handler']->conf;
220 223
  $form['title'] = array(
221 224
    '#type' => 'textfield',
......
262 265

  
263 266
function page_manager_http_response_edit_settings_submit($form, &$form_state) {
264 267
  $machine_name = $form_state['handler']->name;
265
  $name = $form_state['task_id'] . '__' . $form_state['values']['name'];
268
  $name = $form_state['task_name'] . '__' . $form_state['values']['name'];
266 269

  
267 270
  // If new name doesn't equal machine name, we need to update and redirect.
268 271
  if ($machine_name !== $name) {
269
    $form_state['new trail'] = $form_state['trail'];
270
    $delta = array_search($machine_name, $form_state['new trail']);
271
    $form_state['new trail'][$delta] = $name;
272 272
    $form_state['handler']->name = $name;
273
    // If there's a trail, we need to replace it for redirection.
274
    if (isset($form_state['trail'])) {
275
      $form_state['new trail'] = $form_state['trail'];
276
      $delta = array_search($machine_name, $form_state['new trail']);
277
      $form_state['new trail'][$delta] = $name;
278
    }
279
    // If handler id is set, replace it.
280
    if ($form_state['handler_id']) {
281
      $form_state['handler_id'] = $name;
282
    }
283
    // If we're defining a new custom handler, move page handler to new name.
284
    if (isset($form_state['page']->handlers[$machine_name]) && isset($form_state['page']->handler_info[$machine_name])) {
285
      $form_state['page']->handlers[$name] = $form_state['page']->handlers[$machine_name];
286
      unset($form_state['page']->handlers[$machine_name]);
287
      $form_state['page']->handler_info[$name] = $form_state['page']->handler_info[$machine_name];
288
      unset($form_state['page']->handler_info[$machine_name]);
289
    }
273 290
  }
274 291

  
275 292
  $form_state['handler']->conf['title'] = $form_state['values']['title'];

Formats disponibles : Unified diff