@ -74,7 +74,17 @@ class UsersController < ApplicationController
##added by fq
def watch_bids
@bid = Bid . watched_by ( @user )
@bids = Bid . watched_by ( @user )
@offset , @limit = api_offset_and_limit ( { :limit = > 10 } )
@bid_count = @bids . count
@bid_pages = Paginator . new @bid_count , @limit , params [ 'page' ]
@offset || = @bid_pages . reverse_offset
unless @offset == 0
@bid = @bids . offset ( @offset ) . limit ( @limit ) . all . reverse
else
limit = @bid_count % @limit
@bid = @bids . offset ( @offset ) . limit ( limit ) . all . reverse
end
respond_to do | format |
format . html {
@ -108,12 +118,17 @@ class UsersController < ApplicationController
end
# end
# modified by fq
def user_newfeedback
@jour = @user . journals_for_messages
@jour . each_with_index { | j , i | j . indice = i + 1 }
@jours = @user . journals_for_messages . reverse
@limit = 10
@feedback_count = @jours . count
@feedback_pages = Paginator . new @feedback_count , @limit , params [ 'page' ]
@offset || = @feedback_pages . offset
@jour = @jours [ @offset , @limit ]
@state = false
end
# end
def user_comments
@ -157,46 +172,54 @@ class UsersController < ApplicationController
### modified by fq
def show
has =
" show_issues " = > true
" show_changesets " = > true
" show_news " = > true
" show_messages " = > true
" show_bids " = > true
# has =
# "show_issues" => true
# "show_changesets" => true
# "show_news" => true
# "show_messages" => true
# "show_bids" => true
#
#####fq
JournalsForMessage . reference_message ( @user . id
# JournalsForMessage.reference_message(@user.id
# show projects based on current user visibility
@memberships = @user . memberships . all ( :conditions = > Project . visible_condition ( User . current ) )
if @user == User . current
events = [ ]
activity = Redmine :: Activity :: Fetcher . new ( User . current , :author = > User . current )
activity . scope_select { | t | ! has [ " show_ #{ t } " ] . nil? }
events += activity . events ( nil , nil , :limit = > 10 )
@watcher = User . watched_by ( @user )
for user in @watcher
activity = Redmine :: Activity :: Fetcher . new ( User . current , :author = > user )
activity . scope_select { | t | ! has [ " show_ #{ t } " ] . nil? }
events += activity . events ( nil , nil , :limit = > 10 )
end
else
activity = Redmine :: Activity :: Fetcher . new ( User . current , :author = > @user )
activity . scope_select { | t | ! has [ " show_ #{ t } " ] . nil? }
events = activity . events ( nil , nil , :limit = > 10 )
end
@events = [ ]
@events_by_day = events . group_by ( & :event_date )
@events_by_day . keys . sort . reverse . each do | day |
@events += @events_by_day [ day ] . sort { | x , y | y . event_datetime < = > x . event_datetime }
end
# @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
# if @user == User.current
# events = []
# activity = Redmine::Activity::Fetcher.new(User.current, :author => User.current)
# activity.scope_select {|t| !has["show_#{t}"].nil?}
# events += activity.events(nil, nil, :limit => 10)
# @watcher = User.watched_by(@user)
# for user in @watcher
# activity = Redmine::Activity::Fetcher.new(User.current, :author => user)
# activity.scope_select {|t| !has["show_#{t}"].nil?}
# events += activity.events(nil, nil, :limit => 10)
# end
# else
# activity = Redmine::Activity::Fetcher.new(User.current, :author => @user)
# activity.scope_select {|t| !has["show_#{t}"].nil?}
# events = activity.events(nil, nil, :limit => 10)
# end
# @events = []
# @events_by_day = events.group_by(&:event_date)
# @events_by_day.keys.sort.reverse.each do |day|
# @events += @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime}
# end
# @offset, @limit = api_offset_and_limit({:limit => 10})
# @activity_count = @events.size
# @activity_pages = Paginator.new @activity_count, @limit, params['page']
# @offset ||= @activity_pages.offset
# @events_by_day_ = @events.slice(@offset,@limit)
watcher = User . watched_by ( @user )
watcher . push ( User . current )
activity = Activity . where ( 'user_id in (?)' , watcher ) . order ( 'id desc' )
@offset , @limit = api_offset_and_limit ( { :limit = > 10 } )
@activity_count = @events . size
@activity_count = activity . count
@activity_pages = Paginator . new @activity_count , @limit , params [ 'page' ]
@offset || = @activity_pages . offset
@events_by_day_ = @events . slice ( @offset , @limit )
@activity = activity . offset ( @offset ) . limit ( @limit )
#Modified by nie
unless User . current . admin?
