Merge branch 'MAGETWO-52439' of https://github.com/magento-falcons/magento2ce into MAGETWO-56252

shiftedreality · shiftedreality · commit ac0f8628f341 · 2016-08-03T16:26:51.000+03:00
diff --git a/setup/pub/magento/setup/view/pagination.html b/setup/pub/magento/setup/view/pagination.html
@@ -17,7 +17,7 @@
     <input id="pageCurrent"
            class="admin__control-text"
            type="number"
-           value="{{$parent.currentPage}}"
+           ng-value="$parent.currentPage"
            ng-model="$parent.currentPage"
     >
     <label class="admin__control-support-text" for="pageCurrent">
@@ -30,4 +30,4 @@
     >
         <span>Next page</span>
     </button>
-</div>
+</div>
diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
@@ -160,7 +160,7 @@
                     <input id="pageCurrent"
                            class="admin__control-text"
                            type="number"
-                           value="{{currentPage}}"
+                           ng-value="currentPage"
                            ng-model="currentPage"
                     >
                         <label class="admin__control-support-text" for="pageCurrent">

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`<input id="pageCurrent"`
`18`	`18`	`class="admin__control-text"`
`19`	`19`	`type="number"`
`20`		`- value="{{$parent.currentPage}}"`
	`20`	`+ ng-value="$parent.currentPage"`
`21`	`21`	`ng-model="$parent.currentPage"`
`22`	`22`	`>`
`23`	`23`	`<label class="admin__control-support-text" for="pageCurrent">`
`@@ -30,4 +30,4 @@`
`30`	`30`	`>`
`31`	`31`	`<span>Next page</span>`
`32`	`32`	`</button>`
`33`		`-</div>`
	`33`	`+</div>`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@`
`160`	`160`	`<input id="pageCurrent"`
`161`	`161`	`class="admin__control-text"`
`162`	`162`	`type="number"`
`163`		`- value="{{currentPage}}"`
	`163`	`+ ng-value="currentPage"`
`164`	`164`	`ng-model="currentPage"`
`165`	`165`	`>`
`166`	`166`	`<label class="admin__control-support-text" for="pageCurrent">`