Merge pull request #183 from magento-vanilla/PR

[Vanilla] Bug fixes
magento · Mar 20, 2015 · 3c74e6b · 3c74e6b
2 parents ee4bc2d + 45a99b0
commit 3c74e6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Customer/etc/data_source/customer_address.xml b/app/code/Magento/Customer/etc/data_source/customer_address.xml
@@ -49,7 +49,7 @@
             </field>
             <field name="region" source="eav" formElement="input" visible="false"/>
 
-            <field name="postcode" source="eav" formElement="post_code_fix" >
+            <field name="postcode" source="eav" formElement="post_code" >
                 <constraints>
                     <validate name="required-entry"/>
                 </constraints>

diff --git a/lib/web/mage/backend/notification.js b/lib/web/mage/backend/notification.js
@@ -13,7 +13,7 @@ define([
     $.widget('mage.notification', {
         options: {
             templates: {
-                global: '<div class="messages"><div class="message <%- if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>'
+                global: '<div class="messages"><div class="message <% if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>'
             }
         },