hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 12:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #786 from romainneutron/fix-1572

Browse Source 
[3.8] Fix #1572 : Add configuration customization
This commit is contained in:
Romain Neutron
2013-11-14 08:51:19 -08:00
parent ae366c533c 22168ba3bf
commit e2602da9b6
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/classes/User/Adapter.php
View File

@@ -1334,11 +1334,27 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
}
}
if (isset($this->app['phraseanet.configuration']['user-settings'])) {
$this->_prefs = array_replace(
$this->_prefs,
// remove keys that are not defined in default values
array_intersect_key(
$this->app['phraseanet.configuration']['user-settings'],
self::$def_values
)
);
}
$this->preferences_loaded = true;
return $this;
}
public function purgePreferences()
{
$this->notifications_preferences_loaded = $this->preferences_loaded = false;
}
protected function load_notifications_preferences(Application $app)
{
$this->load_preferences();
@@ -1352,7 +1368,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
}
}
}
$this->notification_preferences_loaded = true;
$this->notifications_preferences_loaded = true;
}
public function get_notifications_preference(Application $app, $notification_id)

1
tests/classes/PhraseanetPHPUnitAbstract.php
View File

@@ -201,6 +201,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
return new Client($DI['app'], array());
});
self::$DI['user']->purgePreferences();
}
public function tearDown()

24
tests/classes/userTest.php
View File

@@ -58,6 +58,30 @@ class userTest extends PhraseanetPHPUnitAbstract
$this->assertSame(\User_Adapter::$def_values['editing_top_box'], $user->getPrefs('editing_top_box'));
}
public function testGetPrefWithACustomizedConf()
{
$data = isset(self::$DI['app']['phraseanet.configuration']['user-settings']) ? self::$DI['app']['phraseanet.configuration']['user-settings'] : null;
self::$DI['app']['phraseanet.configuration']['user-settings'] = array(
'images_per_page' => 42,
'images_size' => 666,
'lalala' => 'didou',
);
$user = $this->get_user();
$this->assertNull($user->getPrefs('lalala'));
$this->assertSame(666, $user->getPrefs('images_size'));
$this->assertSame(42, $user->getPrefs('images_per_page'));
$this->assertSame(\User_Adapter::$def_values['editing_top_box'], $user->getPrefs('editing_top_box'));
if (null === $data) {
unset(self::$DI['app']['phraseanet.configuration']['user-settings']);
} else {
self::$DI['app']['phraseanet.configuration']['user-settings'] = $data;
}
}
public function testSetPref()
{
$user = $this->get_user();