Mercurial > hg > soundsoftware-site

comparison app/controllers/my_controller.rb @ 1199:bae194c52296 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch cannam
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 23 Jan 2013 11:10:20 +0000
parents a943f341c99d
children 16826c3afbba 875b5b4c574d
comparison
equal deleted inserted replaced
1134:579587187b77 1199:bae194c52296
19 before_filter :require_login 19 before_filter :require_login
20 20
21 helper :issues 21 helper :issues
22 helper :users 22 helper :users
23 helper :custom_fields 23 helper :custom_fields
24 helper :projects
24 25
25 BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues, 26 BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
26 'issuesreportedbyme' => :label_reported_issues, 27 'issuesreportedbyme' => :label_reported_issues,
27 'issueswatched' => :label_watched_issues, 28 'issueswatched' => :label_watched_issues,
28 'activitymyprojects' => :label_activity_my_recent, 29 'activitymyprojects' => :label_activity_my_recent,
29 'news' => :label_news_latest, 30 'news' => :label_news_latest,
30 'tipoftheday' => :label_tipoftheday, 31 'tipoftheday' => :label_tipoftheday,
31 'calendar' => :label_calendar, 32 'calendar' => :label_calendar,
32 'documents' => :label_document_plural, 33 'documents' => :label_document_plural,
33 'timelog' => :label_spent_time 34 'timelog' => :label_spent_time,
35 'myprojects' => :label_my_projects
34 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze 36 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
35 37
36 DEFAULT_LAYOUT = { 'left' => ['tipoftheday', 'activitymyprojects'], 38 DEFAULT_LAYOUT = { 'left' => ['myprojects', 'activitymyprojects'],
37 'right' => ['issueswatched'] 39 'right' => ['tipoftheday', 'issueswatched']
38 }.freeze 40 }.freeze
39 41
40 verify :xhr => true, 42 verify :xhr => true,
41 :only => [:add_block, :remove_block, :order_blocks] 43 :only => [:add_block, :remove_block, :order_blocks]
42 44