Merge remote-tracking branch 'main-ce/develop' into MAGETWO-51403

magicbunneh · magicbunneh · commit d2400cd6d09c · 2016-04-01T13:27:29.000+03:00
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -27,7 +27,7 @@
                        value=""
                        data-validate="{required:true}"
                        placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"
-                       autocomplete="username"
+                       autocomplete="off"
                     />
             </div>
         </div>
@@ -43,7 +43,7 @@
                        data-validate="{required:true}"
                        value=""
                        placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>"
-                       autocomplete="current-password"
+                       autocomplete="off"
                     />
             </div>
         </div>
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -278,7 +278,11 @@ public function getEntityIdField()
      */
     public function getEntityTable()
     {
-        return isset($this->_data['entity_table']) ? $this->_data['entity_table'] : null;
+        if (isset($this->_data['entity_table'])) {
+            return $this->getResource()->getTable($this->_data['entity_table']);
+        }
+
+        return null;
     }
 
     /**
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
+        <css src="jquery/jstree/themes/default/style.css"/>
         <css src="css/styles-old.css"/>
         <css src="css/styles.css"/>
     </head>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
@@ -320,6 +320,32 @@
     cursor: not-allowed;
 }
 
+//  ToDo: remove after "Product Attributes Mass update" implementation
+.attributes-edit-form {
+    .field {
+        .control {
+            input[type='text'][disabled] ~ .addafter,
+            select[disabled] ~ .addafter,
+            .attribute-change-checkbox {
+                background: none;
+                color: #676056;
+                cursor: inherit;
+                opacity: 1;
+
+                strong {
+                    background: none;
+                }
+            }
+        }
+    }
+
+    .weight-switcher {
+        .addafter {
+            margin-top: 30px;
+        }
+    }
+}
+
 .field .control input[type='text'][disabled] ~ .addafter strong,
 .field .control select[disabled] ~ .addafter strong {
     background-color: #e9e9e9;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
@@ -241,6 +241,8 @@ option:empty {
     }
 
     .admin__control-text {
+        margin: .1rem;
+        padding: @field-control__padding-top - .1rem @field-control__padding-horizontal - .1rem @field-control__padding-bottom - .1rem;
         width: 100%;
     }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -887,6 +887,7 @@
             background-color: #e9e9e9;
             border-color: #adadad;
             opacity: .5;
+
             &.admin__control-checkbox,
             &.admin__control-radio {
                 opacity: 0.01;
@@ -1387,6 +1388,7 @@
             line-height: 1.33;
             vertical-align: middle;
             white-space: normal;
+            word-break: break-all;
 
             &[data-config-scope] {
                 position: relative;
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
@@ -52,6 +52,11 @@ public function __construct(TimezoneInterface $localeDate)
      */
     public function filter($value)
     {
-        return $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
+        $value = $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));
+
+        /**
+         * @todo MAGETWO-51391
+         */
+        return str_replace("\xc2\xa0", '', $value);
     }
 }
diff --git a/lib/web/jquery/jstree/jquery.jstree.js b/lib/web/jquery/jstree/jquery.jstree.js

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,11 @@ public function getEntityIdField()`
`278`	`278`	`*/`
`279`	`279`	`public function getEntityTable()`
`280`	`280`	`{`
`281`		`- return isset($this->_data['entity_table']) ? $this->_data['entity_table'] : null;`
	`281`	`+ if (isset($this->_data['entity_table'])) {`
	`282`	`+ return $this->getResource()->getTable($this->_data['entity_table']);`
	`283`	`+ }`
	`284`	`+`
	`285`	`+ return null;`
`282`	`286`	`}`
`283`	`287`
`284`	`288`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,8 @@ option:empty {`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`.admin__control-text {`
	`244`	`+ margin: .1rem;`
	`245`	`+ padding: @field-control__padding-top - .1rem @field-control__padding-horizontal - .1rem @field-control__padding-bottom - .1rem;`
`244`	`246`	`width: 100%;`
`245`	`247`	`}`
`246`	`248`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@ public function __construct(TimezoneInterface $localeDate)`
`52`	`52`	`*/`
`53`	`53`	`public function filter($value)`
`54`	`54`	`{`
`55`		`- return $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));`
	`55`	`+ $value = $this->_normalToLocalFilter->filter($this->_localToNormalFilter->filter($value));`
	`56`	`+`
	`57`	`+ /**`
	`58`	`+ * @todo MAGETWO-51391`
	`59`	`+ */`
	`60`	`+ return str_replace("\xc2\xa0", '', $value);`
`56`	`61`	`}`
`57`	`62`	`}`