Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Unit tests fixed + models & routers update

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-02-04 11:41:05 +01:00
parent 12c9623e2f
commit c2cb88f995
18 changed files with 148 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Models/Setting.php
View File

@@ -10,8 +10,7 @@ class Setting extends Model {
parent::__construct();
$this->addValidations('name', array(
'required' => 'name_is_blank',
'isString' => 'name_is_not_string'
'required' => __('You need to specify a name.')
));
}
@@ -55,10 +54,11 @@ class Setting extends Model {
$value = serialize($value);
}
return Setting::createOrUpdate(array(
$setting = Setting::createOrUpdate(array(
'name' => $key,
'value' => $value
));
return ($setting->id() > 0 && $setting->getErrors() === false);
} else {
$main_key = array_shift($keys);
@@ -101,8 +101,7 @@ class Setting extends Model {
}
public static function createOrUpdate($model) {
$exists = self::where('name', $model['name'])
->find_one();
$exists = self::where('name', $model['name'])->findOne();
if($exists === false) {
$new_model = self::create();