Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' into cc-1960-internationalize-airtime

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
This commit is contained in:
denise 2012-11-21 11:44:40 -05:00
commit 10b6dd202e
24 changed files with 370 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/controllers/LibraryController.php
View file

@ -343,6 +343,7 @@ class LibraryController extends Zend_Controller_Action
{
$params = $this->getRequest()->getParams();
# terrible name for the method below. it does not only search files.
$r = Application_Model_StoredFile::searchLibraryFiles($params);
//TODO move this to the datatables row callback.