##// END OF EJS Templates
Merged r3944 from trunk....
Eric Davis -
r3880:bc57078b128c
parent child
Show More
@@ -1,38 +1,39
1 1 class CalendarsController < ApplicationController
2 menu_item :calendar
2 3 before_filter :find_optional_project
3 4
4 5 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
5 6
6 7 helper :issues
7 8 helper :projects
8 9 helper :queries
9 10 include QueriesHelper
10 11
11 12 def show
12 13 if params[:year] and params[:year].to_i > 1900
13 14 @year = params[:year].to_i
14 15 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
15 16 @month = params[:month].to_i
16 17 end
17 18 end
18 19 @year ||= Date.today.year
19 20 @month ||= Date.today.month
20 21
21 22 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
22 23 retrieve_query
23 24 @query.group_by = nil
24 25 if @query.valid?
25 26 events = []
26 27 events += @query.issues(:include => [:tracker, :assigned_to, :priority],
27 28 :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
28 29 )
29 30 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
30 31
31 32 @calendar.events = events
32 33 end
33 34
34 35 render :layout => false if request.xhr?
35 36 end
36 37
37 38
38 39 end
@@ -1,222 +1,223
1 1 require 'redmine/access_control'
2 2 require 'redmine/menu_manager'
3 3 require 'redmine/activity'
4 4 require 'redmine/search'
5 5 require 'redmine/custom_field_format'
6 6 require 'redmine/mime_type'
7 7 require 'redmine/core_ext'
8 8 require 'redmine/themes'
9 9 require 'redmine/hook'
10 10 require 'redmine/plugin'
11 11 require 'redmine/wiki_formatting'
12 12 require 'redmine/scm/base'
13 13
14 14 begin
15 15 require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
16 16 rescue LoadError
17 17 # RMagick is not available
18 18 end
19 19
20 20 if RUBY_VERSION < '1.9'
21 21 require 'faster_csv'
22 22 else
23 23 require 'csv'
24 24 FCSV = CSV
25 25 end
26 26
27 27 Redmine::Scm::Base.add "Subversion"
28 28 Redmine::Scm::Base.add "Darcs"
29 29 Redmine::Scm::Base.add "Mercurial"
30 30 Redmine::Scm::Base.add "Cvs"
31 31 Redmine::Scm::Base.add "Bazaar"
32 32 Redmine::Scm::Base.add "Git"
33 33 Redmine::Scm::Base.add "Filesystem"
34 34
35 35 Redmine::CustomFieldFormat.map do |fields|
36 36 fields.register Redmine::CustomFieldFormat.new('string', :label => :label_string, :order => 1)
37 37 fields.register Redmine::CustomFieldFormat.new('text', :label => :label_text, :order => 2)
38 38 fields.register Redmine::CustomFieldFormat.new('int', :label => :label_integer, :order => 3)
39 39 fields.register Redmine::CustomFieldFormat.new('float', :label => :label_float, :order => 4)
40 40 fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
41 41 fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
42 42 fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
43 43 end
44 44
45 45 # Permissions
46 46 Redmine::AccessControl.map do |map|
47 47 map.permission :view_project, {:projects => [:show, :activity]}, :public => true
48 48 map.permission :search_project, {:search => :index}, :public => true
49 49 map.permission :add_project, {:projects => :add}, :require => :loggedin
50 50 map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
51 51 map.permission :select_project_modules, {:projects => :modules}, :require => :member
52 52 map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
53 53 map.permission :manage_versions, {:projects => :settings, :versions => [:new, :edit, :close_completed, :destroy]}, :require => :member
54 54 map.permission :add_subprojects, {:projects => :add}, :require => :member
55 55
56 56 map.project_module :issue_tracking do |map|
57 57 # Issue categories
58 58 map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :edit, :destroy]}, :require => :member
59 59 # Issues
60 60 map.permission :view_issues, {:projects => :roadmap,
61 61 :issues => [:index, :changes, :show, :context_menu, :auto_complete],
62 62 :versions => [:show, :status_by],
63 63 :queries => :index,
64 64 :reports => [:issue_report, :issue_report_details]}
65 65 map.permission :add_issues, {:issues => [:new, :create, :update_form]}
66 66 map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :update_form], :journals => [:new]}
67 67 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
68 68 map.permission :manage_subtasks, {}
69 69 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
70 70 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
71 71 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
72 72 map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
73 73 map.permission :delete_issues, {:issues => :destroy}, :require => :member
74 74 # Queries
75 75 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
76 76 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
77 77 # Gantt & calendar
78 78 map.permission :view_gantt, :gantts => :show
79 79 map.permission :view_calendar, :calendars => :show
80 80 # Watchers
81 81 map.permission :view_issue_watchers, {}
82 82 map.permission :add_issue_watchers, {:watchers => :new}
83 83 map.permission :delete_issue_watchers, {:watchers => :destroy}
84 84 end
85 85
86 86 map.project_module :time_tracking do |map|
87 87 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
88 88 map.permission :view_time_entries, :timelog => [:details, :report]
89 89 map.permission :edit_time_entries, {:timelog => [:edit, :destroy]}, :require => :member
90 90 map.permission :edit_own_time_entries, {:timelog => [:edit, :destroy]}, :require => :loggedin
91 91 map.permission :manage_project_activities, {:projects => [:save_activities, :reset_activities]}, :require => :member
92 92 end
93 93
94 94 map.project_module :news do |map|
95 95 map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
96 96 map.permission :view_news, {:news => [:index, :show]}, :public => true
97 97 map.permission :comment_news, {:news => :add_comment}
98 98 end
99 99
100 100 map.project_module :documents do |map|
101 101 map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
102 102 map.permission :view_documents, :documents => [:index, :show, :download]
103 103 end
104 104
105 105 map.project_module :files do |map|
106 106 map.permission :manage_files, {:projects => :add_file}, :require => :loggedin
107 107 map.permission :view_files, :projects => :list_files, :versions => :download
108 108 end
109 109
110 110 map.project_module :wiki do |map|
111 111 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
112 112 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
113 113 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
114 114 map.permission :view_wiki_pages, :wiki => [:index, :special]
115 115 map.permission :export_wiki_pages, {}
116 116 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
117 117 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
118 118 map.permission :delete_wiki_pages_attachments, {}
119 119 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
120 120 end
121 121
122 122 map.project_module :repository do |map|
123 123 map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
124 124 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
125 125 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
126 126 map.permission :commit_access, {}
127 127 end
128 128
129 129 map.project_module :boards do |map|
130 130 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
131 131 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
132 132 map.permission :add_messages, {:messages => [:new, :reply, :quote]}
133 133 map.permission :edit_messages, {:messages => :edit}, :require => :member
134 134 map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
135 135 map.permission :delete_messages, {:messages => :destroy}, :require => :member
136 136 map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
137 137 end
138 138 end
139 139
140 140 Redmine::MenuManager.map :top_menu do |menu|
141 141 menu.push :home, :home_path
142 142 menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
143 143 menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
144 144 menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
145 145 menu.push :help, Redmine::Info.help_url, :last => true
146 146 end
147 147
148 148 Redmine::MenuManager.map :account_menu do |menu|
149 149 menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
150 150 menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
151 151 menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
152 152 menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
153 153 end
154 154
155 155 Redmine::MenuManager.map :application_menu do |menu|
156 156 # Empty
157 157 end
158 158
159 159 Redmine::MenuManager.map :admin_menu do |menu|
160 160 menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
161 161 menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
162 162 menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
163 163 menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
164 164 menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
165 165 menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
166 166 :html => {:class => 'issue_statuses'}
167 167 menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
168 168 menu.push :custom_fields, {:controller => 'custom_fields'}, :caption => :label_custom_field_plural,
169 169 :html => {:class => 'custom_fields'}
170 170 menu.push :enumerations, {:controller => 'enumerations'}
171 171 menu.push :settings, {:controller => 'settings'}
172 172 menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'},
173 173 :html => {:class => 'server_authentication'}
174 174 menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
175 175 menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
176 176 end
177 177
178 178 Redmine::MenuManager.map :project_menu do |menu|
179 179 menu.push :overview, { :controller => 'projects', :action => 'show' }
180 180 menu.push :activity, { :controller => 'projects', :action => 'activity' }
181 181 menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' },
182 182 :if => Proc.new { |p| p.shared_versions.any? }
183 183 menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
184 184 menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
185 185 :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
186 186 menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
187 menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
187 188 menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
188 189 menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
189 190 menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },
190 191 :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
191 192 menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
192 193 :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
193 194 menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_file_plural
194 195 menu.push :repository, { :controller => 'repositories', :action => 'show' },
195 196 :if => Proc.new { |p| p.repository && !p.repository.new_record? }
196 197 menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
197 198 end
198 199
199 200 Redmine::Activity.map do |activity|
200 201 activity.register :issues, :class_name => %w(Issue Journal)
201 202 activity.register :changesets
202 203 activity.register :news
203 204 activity.register :documents, :class_name => %w(Document Attachment)
204 205 activity.register :files, :class_name => 'Attachment'
205 206 activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
206 207 activity.register :messages, :default => false
207 208 activity.register :time_entries, :default => false
208 209 end
209 210
210 211 Redmine::Search.map do |search|
211 212 search.register :issues
212 213 search.register :news
213 214 search.register :documents
214 215 search.register :changesets
215 216 search.register :wiki_pages
216 217 search.register :messages
217 218 search.register :projects
218 219 end
219 220
220 221 Redmine::WikiFormatting.map do |format|
221 222 format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
222 223 end
General Comments 0
You need to be logged in to leave comments. Login now