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

CC-4434: Make Application_Model_Preference::getValue and setValue private methods

Browse source 
-done
This commit is contained in:
Martin Konecny 2012-09-14 14:53:25 -04:00
parent 6e239d08e9
commit 78460703a2
4 changed files with 17 additions and 11 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(); $userType = $user->getType();
$this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );"); $this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
$data = Application_Model_Preference::getValue("library_datatable", true); $data = Application_Model_Preference::getCurrentLibraryTableSetting();
if ($data != "") { if (!is_null($data)) {
$libraryTable = json_encode(unserialize($data)); $libraryTable = json_encode($data);
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', JSON.stringify($libraryTable) );"); $this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', JSON.stringify($libraryTable) );");
} else { } else {
$this->view->headScript()->appendScript("localStorage.setItem( 'datatables-library', '' );"); $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() public function getLibraryDatatableAction()
{ {
$data = Application_Model_Preference::getValue("library_datatable", true); $data = Application_Model_Preference::getCurrentLibraryTableSetting();
if ($data != "") { if (!is_null($data)) {
$this->view->settings = unserialize($data); $this->view->settings = $data;
} }
} }

2
airtime_mvc/application/models/Datatables.php
View file

@ -57,7 +57,7 @@ class Application_Model_Datatables
public static function findEntries($con, $displayColumns, $fromTable, public static function findEntries($con, $displayColumns, $fromTable,
$data, $dataProp = "aaData") $data, $dataProp = "aaData")
{ {
$librarySetting = Application_Model_Preference::getCurrentLibraryTableSetting(); $librarySetting = Application_Model_Preference::getCurrentLibraryTableColumnMap();
//$displayColumns[] = 'owner'; //$displayColumns[] = 'owner';
// map that maps original column position to db name // map that maps original column position to db name

12
airtime_mvc/application/models/Preference.php
View file

@ -3,7 +3,7 @@
class Application_Model_Preference class Application_Model_Preference
{ {
public static function setValue($key, $value, $isUserValue = false) private static function setValue($key, $value, $isUserValue = false)
{ {
try { try {
//called from a daemon process //called from a daemon process
@ -70,7 +70,7 @@ class Application_Model_Preference
} }
public static function getValue($key, $isUserValue = false) private static function getValue($key, $isUserValue = false)
{ {
try { try {
$con = Propel::getConnection(); $con = Propel::getConnection();
@ -1093,7 +1093,7 @@ class Application_Model_Preference
} }
public static function getCurrentLibraryTableSetting() public static function getCurrentLibraryTableColumnMap()
{ {
$v = self::getValue("library_datatable", true); $v = self::getValue("library_datatable", true);
@ -1118,6 +1118,12 @@ class Application_Model_Preference
$v = self::setValue("library_datatable", $data, true); $v = self::setValue("library_datatable", $data, true);
} }
public static function getCurrentLibraryTableSetting()
{
$data = self::getValue("library_datatable", true);
return ($data != "") ? unserialize($data) : null;
}
public static function setTimelineDatatableSetting($settings) public static function setTimelineDatatableSetting($settings)
{ {