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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-14 16:03:03 -04:00
commit 76ba4bb6f0
15 changed files with 114 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -27,9 +27,9 @@ class ShowbuilderController extends Zend_Controller_Action
$userType = $user->getType();
$this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
$data = Application_Model_Preference::getValue("library_datatable", true);
if ($data != "") {
$libraryTable = json_encode(unserialize($data));
$data = Application_Model_Preference::getCurrentLibraryTableSetting();
if (!is_null($data)) {
$libraryTable = json_encode($data);
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', JSON.stringify($libraryTable) );");
} else {
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', '' );");

6
airtime_mvc/application/controllers/UsersettingsController.php
View file

@ -44,9 +44,9 @@ class UsersettingsController extends Zend_Controller_Action
public function getLibraryDatatableAction()
{
$data = Application_Model_Preference::getValue("library_datatable", true);
if ($data != "") {
$this->view->settings = unserialize($data);
$data = Application_Model_Preference::getCurrentLibraryTableSetting();
if (!is_null($data)) {
$this->view->settings = $data;
}
}