comparison app/controllers/my_controller.rb @ 1225:edf7563e2653 live

Merge from branch "cannam"
author Chris Cannam
date Tue, 12 Mar 2013 15:14:07 +0000
parents 2c59ee348e2b
children d280360758e5
comparison
equal deleted inserted replaced
1220:31aee88c279b 1225:edf7563e2653
36 'myprojects' => :label_my_projects, 36 'myprojects' => :label_my_projects,
37 'colleagues' => :label_my_colleagues 37 'colleagues' => :label_my_colleagues
38 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze 38 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
39 39
40 DEFAULT_LAYOUT = { 'left' => ['myprojects', 'activitymyprojects'], 40 DEFAULT_LAYOUT = { 'left' => ['myprojects', 'activitymyprojects'],
41 'right' => ['tipoftheday', 'issueswatched'] 41 'right' => ['tipoftheday', 'colleagues', 'issueswatched']
42 }.freeze 42 }.freeze
43 43
44 verify :xhr => true, 44 verify :xhr => true,
45 :only => [:add_block, :remove_block, :order_blocks] 45 :only => [:add_block, :remove_block, :order_blocks]
46 46