commit af4ef0a0c7630e7bca26ee07d79226f73be69107
parent 3f84c6879ad32ddfdd7c47bc4645b563e15eca9a
Author: Felicia Hummel <felicitus@felicitus.org>
Date: Fri, 6 Jan 2017 21:57:31 +0100
Merge pull request #769 from partkeepr/PartKeepr-54
sort store prior sorting
Diffstat:
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/OctoPart/DataApplicator.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/OctoPart/DataApplicator.js
@@ -286,11 +286,13 @@ Ext.define("PartKeepr.Components.OctoPart.DataApplicator", {
findSiPrefixForValueAndUnit: function (value, unit) {
var i = 0, prefixedValue, siPrefix;
+ siPrefix = PartKeepr.getApplication().getSiPrefixStore().findRecord("exponent", 0, 0, false, false, true);
+
if (!(unit instanceof PartKeepr.UnitBundle.Entity.Unit)) {
- return PartKeepr.getApplication().getSiPrefixStore().findRecord("exponent", 0, 0, false, false, true);
+ return siPrefix;
}
- siPrefix = PartKeepr.getApplication().getSiPrefixStore().findRecord("exponent", 0, 0, false, false, true);
+ unit.prefixes().sort("exponent", "desc");
for (i=0;i<unit.prefixes().getCount();i++) {
siPrefix = unit.prefixes().getAt(i);