Fix issue #123 (@Nodesys)

GoteoFoundation · Aug 3, 2014 · 677f361 · 677f361
1 parent 27155ee
commit 677f361
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/controller/admin/blog.php b/controller/admin/blog.php
@@ -61,7 +61,7 @@ public static function process ($action = 'list', $id = null, $filters = array()
 			if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                     if (empty($_POST['blog'])) {
                         Message::Error('Hemos perdido de vista su blog!!!');
-                        break;
+                        throw new Redirection('/admin/blog');
                     }
 
                     $editing = false;

diff --git a/model/blog.php b/model/blog.php
@@ -60,14 +60,16 @@ public static function get ($owner, $type = 'project') {
                         $blog->project = $blog->owner;
                         break;
                 }
+
                 if ($blog->node == \GOTEO_NODE) {
                     $blog->posts = Blog\Post::getAll();
                 } elseif (!empty($blog->id)) {
                     $blog->posts = Blog\Post::getAll($blog->id);
                 } else {
                     $blog->posts = array();
                 }
-                return $blog;
+
+            return $blog;
         }
 
         /*

diff --git a/model/blog/post.php b/model/blog/post.php
@@ -149,18 +149,21 @@ public static function getAll ($blog = null, $limit = null, $published = true) {
             if ($published) {
                 $sql .= " AND post.publish = 1
                 ";
+                // @NODESYS
+                /*
                 if (empty($blog)) {
                 $sql .= " AND blog.owner IN (SELECT id FROM node WHERE active = 1)
                     AND blog.owner != 'testnode'
                 ";
                 }
+                */
             }
             $sql .= "ORDER BY post.date DESC, post.id DESC
                 ";
             if (!empty($limit)) {
                 $sql .= "LIMIT $limit";
             }
-            
+
             $query = static::query($sql, $values);
 
             foreach ($query->fetchAll(\PDO::FETCH_CLASS, __CLASS__) as $post) {
@@ -191,8 +194,9 @@ public static function getAll ($blog = null, $limit = null, $published = true) {
 
                     case 'node':
                         $post->user   = User::getMini($post->author);
-                        $node_blog = Node::get($post->owner_id);
-                        $post->owner_name = $node_blog->name;
+                        // @NODESYS
+                        //$node_blog = Node::get($post->owner_id);
+                        $post->owner_name = $post->user->name;
                         break;
                 }
 
@@ -332,8 +336,9 @@ public static function getList ($filters = array(), $published = true) {
 
                     case 'node':
                         $post->user   = User::getMini($post->author);
-                        $node_blog = Node::get($post->owner_id);
-                        $post->owner_name = $node_blog->name;
+                        // @NODESYS
+                        // $node_blog = Node::get($post->owner_id);
+                        $post->owner_name = $post->user->name;
                         break;
                 }