Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2044865 by Gábor Hojtsy: Fixed Picture mappings cannot be edited.

8.0.x
Alex Pott 2013-07-19 11:02:40 +01:00
parent 33c488d583
commit ce46bf1e9a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php
View File

@ -144,7 +144,7 @@ class PictureMappingFormController extends EntityFormController {
// another breakpoint group. // another breakpoint group.
if (!$picture_mapping->hasMappings()) { if (!$picture_mapping->hasMappings()) {
$uri = $picture_mapping->uri(); $uri = $picture_mapping->uri();
$form_state['redirect'] = $uri['path'] . '/edit'; $form_state['redirect'] = $uri['path'];
} }
else { else {
$form_state['redirect'] = 'admin/config/media/picturemapping'; $form_state['redirect'] = 'admin/config/media/picturemapping';

6
core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
View File

@ -102,7 +102,7 @@ class PictureAdminUITest extends WebTestBase {
$this->assertText('mapping_one'); $this->assertText('mapping_one');
// Edit the group. // Edit the group.
$this->drupalGet('admin/config/media/picturemapping/mapping_one/edit'); $this->drupalGet('admin/config/media/picturemapping/mapping_one');
$this->assertFieldByName('label', 'Mapping One'); $this->assertFieldByName('label', 'Mapping One');
$this->assertFieldByName('breakpointGroup', 'atestset'); $this->assertFieldByName('breakpointGroup', 'atestset');
@ -122,8 +122,8 @@ class PictureAdminUITest extends WebTestBase {
'mappings[custom.user.medium][1x]' => 'medium', 'mappings[custom.user.medium][1x]' => 'medium',
'mappings[custom.user.large][1x]' => 'large', 'mappings[custom.user.large][1x]' => 'large',
); );
$this->drupalPost('admin/config/media/picturemapping/mapping_one/edit', $edit, t('Save')); $this->drupalPost('admin/config/media/picturemapping/mapping_one', $edit, t('Save'));
$this->drupalGet('admin/config/media/picturemapping/mapping_one/edit'); $this->drupalGet('admin/config/media/picturemapping/mapping_one');
$this->assertFieldByName('mappings[custom.user.small][1x]', 'thumbnail'); $this->assertFieldByName('mappings[custom.user.small][1x]', 'thumbnail');
$this->assertFieldByName('mappings[custom.user.small][2x]', ''); $this->assertFieldByName('mappings[custom.user.small][2x]', '');
$this->assertFieldByName('mappings[custom.user.medium][1x]', 'medium'); $this->assertFieldByName('mappings[custom.user.medium][1x]', 'medium');

2
core/modules/picture/picture.module
View File

@ -64,7 +64,7 @@ function picture_menu() {
'route_name' => 'picture_mapping_page_add', 'route_name' => 'picture_mapping_page_add',
'type' => MENU_LOCAL_ACTION, 'type' => MENU_LOCAL_ACTION,
); );
$items['admin/config/media/picturemapping/%picture_mapping/edit'] = array( $items['admin/config/media/picturemapping/%picture_mapping'] = array(
'title' => 'Edit picture mapping', 'title' => 'Edit picture mapping',
'route_name' => 'picture_mapping_page_edit', 'route_name' => 'picture_mapping_page_edit',
); );

2
core/modules/picture/picture.routing.yml
View File

@ -13,7 +13,7 @@ picture_mapping_page_add:
_permission: 'administer pictures' _permission: 'administer pictures'
picture_mapping_page_edit: picture_mapping_page_edit:
pattern: '/admin/config/media/picturemapping/{picture_mapping}/edit' pattern: '/admin/config/media/picturemapping/{picture_mapping}'
defaults: defaults:
_entity_form: 'picture_mapping.edit' _entity_form: 'picture_mapping.edit'
requirements: requirements: