Revision 442:753f1380d6bc config/.svn/text-base

View differences:

config/.svn/text-base/environment.rb.svn-base
36 36
  
37 37
  # Activate observers that should always be running
38 38
  # config.active_record.observers = :cacher, :garbage_collector
39
  config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer
39
  config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
40 40

  
41 41
  # Make Active Record use UTC-base instead of local time
42 42
  # config.active_record.default_timezone = :utc
config/.svn/text-base/routes.rb.svn-base
14 14
  map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
15 15
  map.connect 'help/:ctrl/:page', :controller => 'help'
16 16

  
17
  map.connect 'projects/:project_id/time_entries/report', :controller => 'time_entry_reports', :action => 'report'
18 17
  map.with_options :controller => 'time_entry_reports', :action => 'report',:conditions => {:method => :get} do |time_report|
18
    time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report'
19
    time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report.:format'
20
    time_report.connect 'projects/:project_id/time_entries/report'
21
    time_report.connect 'projects/:project_id/time_entries/report.:format'
19 22
    time_report.connect 'time_entries/report'
20 23
    time_report.connect 'time_entries/report.:format'
21
    time_report.connect 'projects/:project_id/time_entries/report.:format'
22 24
  end
23 25

  
26
  map.bulk_edit_time_entry 'time_entries/bulk_edit',
27
                   :controller => 'timelog', :action => 'bulk_edit', :conditions => { :method => :get }
28
  map.bulk_update_time_entry 'time_entries/bulk_edit',
29
                   :controller => 'timelog', :action => 'bulk_update', :conditions => { :method => :post }
30
  map.time_entries_context_menu '/time_entries/context_menu',
31
                   :controller => 'context_menus', :action => 'time_entries'
24 32
  # TODO: wasteful since this is also nested under issues, projects, and projects/issues
25 33
  map.resources :time_entries, :controller => 'timelog'
26 34
  
......
80 88
  map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post }
81 89
  map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy
82 90

  
83
  map.resource :gantt, :path_prefix => '/issues', :controller => 'gantts', :only => [:show, :update]
84
  map.resource :gantt, :path_prefix => '/projects/:project_id/issues', :controller => 'gantts', :only => [:show, :update]
85
  map.resource :calendar, :path_prefix => '/issues', :controller => 'calendars', :only => [:show, :update]
86
  map.resource :calendar, :path_prefix => '/projects/:project_id/issues', :controller => 'calendars', :only => [:show, :update]
91
  map.with_options :controller => 'gantts', :action => 'show' do |gantts_routes|
92
    gantts_routes.connect '/projects/:project_id/issues/gantt'
93
    gantts_routes.connect '/projects/:project_id/issues/gantt.:format'
94
    gantts_routes.connect '/issues/gantt.:format'
95
  end
96
  
97
  map.with_options :controller => 'calendars', :action => 'show' do |calendars_routes|
98
    calendars_routes.connect '/projects/:project_id/issues/calendar'
99
    calendars_routes.connect '/issues/calendar'
100
  end
87 101

  
88 102
  map.with_options :controller => 'reports', :conditions => {:method => :get} do |reports|
89 103
    reports.connect 'projects/:id/issues/report', :action => 'issue_report'
......
215 229
  map.resources :groups
216 230
  
217 231
  #left old routes at the bottom for backwards compat
232
  map.connect 'projects/:project_id/queries/:action', :controller => 'queries'
218 233
  map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
219 234
  map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
220 235
  map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'

Also available in: Unified diff