Merge pull request #52 from skiv/master-dev-dev

Master dev dev
litecommerce · Nov 7, 2012 · dc4ec32 · dc4ec32
2 parents 48de006 + 5803717
commit dc4ec32
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/classes/XLite/Model/Attribute.php b/src/classes/XLite/Model/Attribute.php
@@ -121,7 +121,7 @@ class Attribute extends \XLite\Model\Base\I18n
      *
      * @Column (type="fixedstring", length=1)
      */
-    protected $type = self::TYPE_NUMBER;
+    protected $type = self::TYPE_TEXT;
 
     /**
      * Constructor
@@ -157,8 +157,8 @@ public function getProductsCount()
     public static function getTypes($type = null)
     {
         $list = array(
-            self::TYPE_NUMBER   => 'Number',
             self::TYPE_TEXT     => 'Text',
+            self::TYPE_NUMBER   => 'Number',
             self::TYPE_CHECKBOX => 'Checkbox',
             self::TYPE_SELECT   => 'Select',
         );
@@ -234,9 +234,16 @@ public function setDefaultValue($value)
      */
     public function getDefaultValue()
     {
-        return self::TYPE_CHECKBOX == $this->type
-            ? (boolean)$this->defaultValue
-            : $this->defaultValue;
+        $value = $this->defaultValue;
+        if (self::TYPE_NUMBER == $this->type) {
+            $value = (float)$value;
+
+        } elseif (self::TYPE_CHECKBOX == $this->type) {
+            $value = (boolean)$value;
+
+        }
+
+        return $value; 
     }
 
     /**

diff --git a/src/skins/admin/en/form_field/input/text/combobox.css b/src/skins/admin/en/form_field/input/text/combobox.css
@@ -15,7 +15,7 @@ input.combobox {
 }
 
 div.combobox-select {
-  background: transparent url(../images/arrows-select.png) center center no-repeat;
+  background: transparent url(../../../images/arrows-select.png) center center no-repeat;
   width: 21px;
   height: 21px;
   float: left;