diff --git a/module/my/model.php b/module/my/model.php index 06456510bc..92f9060ccc 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -857,8 +857,9 @@ class myModel extends model ->where($myStoryQuery) ->andWhere('t1.type')->eq('story') ->andWhere('t1.assignedTo',1)->eq($this->app->user->account) - ->orWhere('t5.reviewer')->eq($this->app->user->account) + ->orWhere("(t5.reviewer = '{$this->app->user->account}' and t1.status in('reviewing','changing'))") ->markRight(1) + ->andWhere('t1.product')->ne('0') ->andWhere('t1.deleted')->eq(0) ->orderBy($orderBy) ->page($pager, 't1.id') diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index fe38c60509..fe7a73b288 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -27,7 +27,7 @@
-
rawMethod == 'contribute' ? 'contributeStory' : 'workStory');?>>
+
rawMethod == 'contribute' ? 'contributeStory' : 'workStory');?>>

my->noData, $lang->SRCommon);?>