浏览代码

Fix issue #158 : ajout premier flux fonctionne

La catégorie par défaut est bien mise par défaut pour le premier flux
Marien Fressinaud 12 年之前
父节点
当前提交
adc33811c3
共有 3 个文件被更改,包括 11 次插入4 次删除
  1. 3 0
      app/controllers/configureController.php
  2. 7 3
      app/controllers/feedController.php
  3. 1 1
      app/models/Category.php

+ 3 - 0
app/controllers/configureController.php

@@ -8,6 +8,9 @@ class configureController extends ActionController {
 				array ('error' => array (Translate::t ('access_denied')))
 			);
 		}
+
+		$catDAO = new CategoryDAO ();
+		$catDAO->checkDefault ();
 	}
 
 	public function categorizeAction () {

+ 7 - 3
app/controllers/feedController.php

@@ -9,14 +9,18 @@ class feedController extends ActionController {
 			);
 		}
 
-		$catDAO = new CategoryDAO ();
-		$catDAO->checkDefault ();
+		$this->catDAO = new CategoryDAO ();
+		$this->catDAO->checkDefault ();
 	}
 
 	public function addAction () {
 		if (Request::isPost ()) {
 			$url = Request::param ('url_rss');
-			$cat = Request::param ('category');
+			$cat = Request::param ('category', false);
+			if ($cat === false) {
+				$def_cat = $this->catDAO->getDefault ();
+				$cat = $def_cat->id ();
+			}
 			$user = Request::param ('username');
 			$pass = Request::param ('password');
 			$params = array ();

+ 1 - 1
app/models/Category.php

@@ -175,7 +175,7 @@ class CategoryDAO extends Model_pdo {
 	public function checkDefault () {
 		$def_cat = $this->searchById ('000000');
 
-		if (!$def_cat) {
+		if ($def_cat === false) {
 			$cat = new Category (Translate::t ('default_category'));
 			$cat->_id ('000000');