azeaze.diff

diff --cc src/Pim/Bundle/EnrichBundle/Resources/views/MassEditAction/configure.html.twig
index 2ee1827c98,dfdba77451..0000000000
--- a/src/Pim/Bundle/EnrichBundle/Resources/views/MassEditAction/configure.html.twig
+++ b/src/Pim/Bundle/EnrichBundle/Resources/views/MassEditAction/configure.html.twig
@@@ -37,34 -34,19 +37,50 @@@
                  {% block formContent %}
                  {% endblock %}
              </div>
++<<<<<<< HEAD
 +            <div class="AknWidget-footer">
 +                <div class="AknButtonList AknButtonList--right configuration">
 +                    {{ elements.link(
 +                        'btn.back',
 +                        path(backButtonRoute, queryParams),
 +                        {'class': 'btn-cancel AknButtonList-item', 'icon': 'chevron-left'}
 +                    ) }}
 +                    {{ elements.link(
 +                        'btn.next',
 +                        null,
 +                        {'class': ['next btn-next AknButton--apply AknButtonList-item'], 'icon': 'chevron-right'}
 +                    ) }}
 +                </div>
 +
 +                <div class="AknButtonList AknButtonList--right confirmation AknButtonList--hide">
 +                    {{ elements.link(
 +                        'btn.cancel',
 +                        null,
 +                        {'class': 'cancel btn-cancel AknButtonList-item', 'icon': 'chevron-left'}
 +                    ) }}
 +                    {{ elements.submitBtn(
 +                        'btn.confirm',
 +                        'ok',
 +                        'AknButtonList-item'
 +                    ) }}
 +                </div>
 +            </div>
 +        </div>
++=======
+         </div>
+ 
+     <input type="hidden" name="itemIds" value="" class="pim-hidden-form-input" />
+ 
+     <div class="row span12 offset1 buffer-top configuration">
+         {{ elements.link('btn.back', path(backButtonRoute, queryParams), {'class': 'btn-cancel', 'icon': 'chevron-left'}) }}
+         {{ elements.link('btn.next', null, {'class': ['next btn-next', 'btn-primary'], 'icon': 'chevron-right'}) }}
+     </div>
+ 
+     <div class="row offset1 buffer-top confirmation hide">
+         {{ elements.link('btn.cancel', null, {'class': 'cancel btn-cancel', 'icon': 'chevron-left'}) }}
+         {{ elements.submitBtn('btn.confirm', 'ok') }}
+     </div>
++>>>>>>> origin/1.6
  
      {{ form_end(form) }}
  {% endblock %}
@@@ -163,10 -138,12 +179,13 @@@
                      $('a.cancel').on('click', function() {
                          $('.wizard').wizard({ currentStep: {{ previousStepNumber|default(3) }} });
                          enableForm();
 -                        $('.configuration').removeClass('hide');
 -                        $('.confirmation').addClass('hide');
 +                        $('.configuration').removeClass('AknButtonList--hide');
 +                        $('.AknButtonList.confirmation').addClass('AknButtonList--hide');
 +                        $('.AknMessageBox.confirmation').addClass('AknMessageBox--hide');
                      });
+ 
+                     var itemIds = JSON.parse(localStorage.getItem('mass_action.itemIds')).join(',');
+                     $('input.pim-hidden-form-input[name="itemIds"]').val(itemIds)
                  });
              }
          );