mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Dashboard Stream when Visibility Null

Browse Source
This commit is contained in:
Lucas Bartholemy 2014-03-24 10:40:51 +01:00
parent 58ff950b85
commit c00132690c
2 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
protected/modules_core/wall/models/Content.php → protected/models/Content.php
View File

@ -1,5 +1,23 @@
<?php
/**
* HumHub
* Copyright © 2014 The HumHub Project
*
* The texts of the GNU Affero General Public License with an additional
* permission and of our proprietary license can be found at and
* in the LICENSE file you have received along with this program.
*
* According to our dual licensing model, this program can be used either
* under the terms of the GNU Affero General Public License, version 3,
* or under a proprietary license.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*/
/**
* This is the model class for table "content".
*
@ -18,7 +36,7 @@
* @property string $updated_at
* @property integer $updated_by
*
* @package humhub.modules_core.wall.models
* @package humhub.models
* @since 0.5
*/
class Content extends CActiveRecord {
@ -161,6 +179,19 @@ class Content extends CActiveRecord {
if ($this->user_id == "")
throw new CException("Could not save content without user_id!");
// Set some default values
if (!$this->archived) {
$this->archived = 0;
}
if (!$this->visibility) {
$this->visibility = self::VISIBILITY_PRIVATE;
}
if (!$this->sticked) {
$this->sticked = 0;
}
return parent::beforeSave();
}

55
protected/modules_core/wall/StreamAction.php
View File

@ -7,8 +7,7 @@
* @since 0.5
* @author Luke
*/
class StreamAction extends CAction
{
class StreamAction extends CAction {
/**
* Constants used for sorting
@ -16,14 +15,12 @@ class StreamAction extends CAction
const SORT_CREATED_AT = 1;
const SORT_UPDATED_AT = 2;
/**
* Modes
*/
const MODE_NORMAL = "normal";
const MODE_ACTIVITY = "activity";
/**
* @var String Type of wall output (normal or activity). Default is 'normal'.
*/
@ -104,8 +101,7 @@ class StreamAction extends CAction
*
* (When called from console, this method is not called.)
*/
public function init()
{
public function init() {
Yii::beginProfile('initStreamAction');
@ -120,9 +116,9 @@ class StreamAction extends CAction
}
// Options how many items
$this->wallEntryFrom = (int)Yii::app()->request->getParam('from');
$this->wallEntryTo = (int)Yii::app()->request->getParam('to');
$this->wallEntryLimit = (int)Yii::app()->request->getParam('limit', 2);
$this->wallEntryFrom = (int) Yii::app()->request->getParam('from');
$this->wallEntryTo = (int) Yii::app()->request->getParam('to');
$this->wallEntryLimit = (int) Yii::app()->request->getParam('limit', 2);
// Sorting (switch to updated at)
if (Yii::app()->request->getParam('sort') == 'u') {
@ -149,8 +145,7 @@ class StreamAction extends CAction
*
* @return type
*/
public function runConsole()
{
public function runConsole() {
$this->init();
$this->prepareSQL();
$this->setupFilterSQL();
@ -193,8 +188,7 @@ class StreamAction extends CAction
/**
* Execute the Stream Action and returns a JSON output.
*/
public function run()
{
public function run() {
$this->init();
$this->prepareSQL();
@ -232,13 +226,11 @@ class StreamAction extends CAction
LIMIT {$this->wallEntryLimit}
";
// Execute SQL
$entries = WallEntry::model()->with('content')->findAllBySql($sql, $this->sqlParams);
// Save Wall Type
Wall::$currentType = $this->type;
@ -252,13 +244,13 @@ class StreamAction extends CAction
$user = $underlyingObject->content->user;
$output .= Yii::app()->getController()->renderPartial(
'wall.views.wallEntry', array(
'entry' => $entry,
'user' => $user,
'mode' => $this->mode,
'object' => $underlyingObject,
'content' => $underlyingObject->getWallOut()
), true
'wall.views.wallEntry', array(
'entry' => $entry,
'user' => $user,
'mode' => $this->mode,
'object' => $underlyingObject,
'content' => $underlyingObject->getWallOut()
), true
);
$generatedWallEntryIds[] = $entry->id;
$lastEntryId = $entry->id;
@ -291,8 +283,7 @@ class StreamAction extends CAction
*
* @throws CHttpException
*/
protected function prepareSQL()
{
protected function prepareSQL() {
/**
* Build SQL
@ -328,7 +319,6 @@ class StreamAction extends CAction
if ($this->type == Wall::TYPE_DASHBOARD) {
// In case of an space entry, we need some left join, to be able to verify that the user
// has access to see this entry
$this->sqlJoin .= "
@ -364,8 +354,8 @@ class StreamAction extends CAction
$this->sqlWhere .= "
AND (
(wall.object_model IS NULL) OR
(content.visibility = 0 AND user_space_membership.status = 3) OR
(content.visibility = 1)
(content.visibility = 0 AND user_space_membership.status = " . UserSpaceMembership::STATUS_MEMBER . ") OR
(content.visibility = 1 OR content.visibility IS NULL)
)
";
@ -403,8 +393,7 @@ class StreamAction extends CAction
/**
* Adds filters to the SQL Query
*/
protected function setupFilterSQL()
{
protected function setupFilterSQL() {
if ($this->wallEntryDateTo != "") {
$this->sqlParams[':maxDate'] = $this->wallEntryDateTo;
@ -412,7 +401,7 @@ class StreamAction extends CAction
}
// Show only content with attached files
if (in_array('entry_files', $this->filters) ) {
if (in_array('entry_files', $this->filters)) {
$this->sqlWhere .= " AND (SELECT id FROM file WHERE file.object_model=content.object_model AND file.object_id=content.object_id) IS NOT NULL";
}