Mercurial > hg > soundsoftware-site
comparison app/controllers/my_controller.rb @ 443:350acce374a2 cannam
Merge from branch "cannam-pre-20110113-merge"
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:55:38 +0100 |
parents | 73ff0e6a11b1 ce85aa993384 |
children | ef125e1f3a10 |
comparison
equal
deleted
inserted
replaced
442:753f1380d6bc | 443:350acce374a2 |
---|---|
23 helper :custom_fields | 23 helper :custom_fields |
24 | 24 |
25 BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues, | 25 BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues, |
26 'issuesreportedbyme' => :label_reported_issues, | 26 'issuesreportedbyme' => :label_reported_issues, |
27 'issueswatched' => :label_watched_issues, | 27 'issueswatched' => :label_watched_issues, |
28 'activitymyprojects' => :label_activity_my_recent, | |
28 'news' => :label_news_latest, | 29 'news' => :label_news_latest, |
30 'tipoftheday' => :label_tipoftheday, | |
29 'calendar' => :label_calendar, | 31 'calendar' => :label_calendar, |
30 'documents' => :label_document_plural, | 32 'documents' => :label_document_plural, |
31 'timelog' => :label_spent_time | 33 'timelog' => :label_spent_time |
32 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze | 34 }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze |
33 | 35 |
34 DEFAULT_LAYOUT = { 'left' => ['issuesassignedtome'], | 36 DEFAULT_LAYOUT = { 'left' => ['tipoftheday', 'activitymyprojects'], |
35 'right' => ['issuesreportedbyme'] | 37 'right' => ['issueswatched','calendar'] |
36 }.freeze | 38 }.freeze |
37 | 39 |
38 verify :xhr => true, | 40 verify :xhr => true, |
39 :only => [:add_block, :remove_block, :order_blocks] | 41 :only => [:add_block, :remove_block, :order_blocks] |
40 | 42 |