|
|
|
@ -410,8 +410,8 @@ class UsersController < ApplicationController
|
|
|
|
|
@message = messages[@info_pages.offset, @info_pages.per_page]
|
|
|
|
|
@state = 2
|
|
|
|
|
else
|
|
|
|
|
where_condition = nil;#"act_type <> 'JournalsForMessage'"
|
|
|
|
|
where_condition = "act_type <> 'JournalsForMessage'"
|
|
|
|
|
where_condition = nil;
|
|
|
|
|
# where_condition = "act_type <> 'JournalsForMessage'"
|
|
|
|
|
if @user == User.current
|
|
|
|
|
watcher = User.watched_by(@user)
|
|
|
|
|
watcher.push(User.current)
|
|
|
|
|