Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

airtime_mvc/application/models/airtime/CcFiles.php

@@ -27,36 +27,6 @@ class CcFiles extends BaseCcFiles {
 		return $length;
 	}
 
-    public function getDbLength($format = "H:i:s.u")
-    {
-        return parent::getDbLength($format);
-    }
-
-    public function setDbLength($v)
-    {
-        //we are using DateTime instead of DateInterval because the latter doesn't
-        //support subseconds :(
-        if ($v instanceof DateTime) {
-            $dt = $v;
-        }
-        else {
-
-            try {
-
-                $dt = new DateTime($v);
-
-            } catch (Exception $x) {
-                throw new PropelException('Error parsing date/time value: ' .
-                    var_export($v, true), $x);
-            }
-        }
-
-        $this->length = $dt->format('H:i:s.u');
-        $this->modifiedColumns[] = CcFilesPeer::LENGTH;
-
-        return $this;
-    }
-
     public function setDbTrackNumber($v)
     {
         $max = pow(2, 31)-1;

airtime_mvc/public/js/airtime/library/library.js

@@ -760,7 +760,7 @@ var AIRTIME = (function(AIRTIME) {
             },
             "fnDrawCallback": AIRTIME.library.fnDrawCallback,
             
-            "aaSorting": [[3, 'asc']],
+            "aaSorting": [[5, 'asc']],
             "sPaginationType": "full_numbers",
             "bJQueryUI": true,
             "bAutoWidth": false,
@@ -783,9 +783,6 @@ var AIRTIME = (function(AIRTIME) {
             
         });
 
-        //sort by title, by default
-        oTable.fnSort( [ [5, 'asc'] ] );
-
         setColumnFilter(oTable);
         oTable.fnSetFilteringDelay(350);