##// END OF EJS Templates
Reverted r4381....
Jean-Philippe Lang -
r4274:44c9ad687fa6
parent child
Show More
@@ -1,44 +1,44
1 1 class CalendarsController < ApplicationController
2 menu_item :issues
2 menu_item :calendar
3 3 before_filter :find_optional_project
4 4
5 5 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
6 6
7 7 helper :issues
8 8 helper :projects
9 9 helper :queries
10 10 include QueriesHelper
11 11 helper :sort
12 12 include SortHelper
13 13
14 14 def show
15 15 if params[:year] and params[:year].to_i > 1900
16 16 @year = params[:year].to_i
17 17 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
18 18 @month = params[:month].to_i
19 19 end
20 20 end
21 21 @year ||= Date.today.year
22 22 @month ||= Date.today.month
23 23
24 24 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
25 25 retrieve_query
26 26 @query.group_by = nil
27 27 if @query.valid?
28 28 events = []
29 29 events += @query.issues(:include => [:tracker, :assigned_to, :priority],
30 30 :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
31 31 )
32 32 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
33 33
34 34 @calendar.events = events
35 35 end
36 36
37 37 render :action => 'show', :layout => false if request.xhr?
38 38 end
39 39
40 40 def update
41 41 show
42 42 end
43 43
44 44 end
@@ -1,36 +1,36
1 1 class GanttsController < ApplicationController
2 menu_item :issues
2 menu_item :gantt
3 3 before_filter :find_optional_project
4 4
5 5 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
6 6
7 7 helper :gantt
8 8 helper :issues
9 9 helper :projects
10 10 helper :queries
11 11 include QueriesHelper
12 12 helper :sort
13 13 include SortHelper
14 14 include Redmine::Export::PDF
15 15
16 16 def show
17 17 @gantt = Redmine::Helpers::Gantt.new(params)
18 18 @gantt.project = @project
19 19 retrieve_query
20 20 @query.group_by = nil
21 21 @gantt.query = @query if @query.valid?
22 22
23 23 basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
24 24
25 25 respond_to do |format|
26 26 format.html { render :action => "show", :layout => !request.xhr? }
27 27 format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
28 28 format.pdf { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => "#{basename}.pdf") }
29 29 end
30 30 end
31 31
32 32 def update
33 33 show
34 34 end
35 35
36 36 end
@@ -1,229 +1,231
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/notifiable'
12 12 require 'redmine/wiki_formatting'
13 13 require 'redmine/scm/base'
14 14
15 15 begin
16 16 require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
17 17 rescue LoadError
18 18 # RMagick is not available
19 19 end
20 20
21 21 if RUBY_VERSION < '1.9'
22 22 require 'faster_csv'
23 23 else
24 24 require 'csv'
25 25 FCSV = CSV
26 26 end
27 27
28 28 Redmine::Scm::Base.add "Subversion"
29 29 Redmine::Scm::Base.add "Darcs"
30 30 Redmine::Scm::Base.add "Mercurial"
31 31 Redmine::Scm::Base.add "Cvs"
32 32 Redmine::Scm::Base.add "Bazaar"
33 33 Redmine::Scm::Base.add "Git"
34 34 Redmine::Scm::Base.add "Filesystem"
35 35
36 36 Redmine::CustomFieldFormat.map do |fields|
37 37 fields.register Redmine::CustomFieldFormat.new('string', :label => :label_string, :order => 1)
38 38 fields.register Redmine::CustomFieldFormat.new('text', :label => :label_text, :order => 2)
39 39 fields.register Redmine::CustomFieldFormat.new('int', :label => :label_integer, :order => 3)
40 40 fields.register Redmine::CustomFieldFormat.new('float', :label => :label_float, :order => 4)
41 41 fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
42 42 fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
43 43 fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
44 44 end
45 45
46 46 # Permissions
47 47 Redmine::AccessControl.map do |map|
48 48 map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
49 49 map.permission :search_project, {:search => :index}, :public => true
50 50 map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
51 51 map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
52 52 map.permission :select_project_modules, {:projects => :modules}, :require => :member
53 53 map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
54 54 map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
55 55 map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
56 56
57 57 map.project_module :issue_tracking do |map|
58 58 # Issue categories
59 59 map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :edit, :destroy]}, :require => :member
60 60 # Issues
61 61 map.permission :view_issues, {:issues => [:index, :show],
62 62 :auto_complete => [:issues],
63 63 :context_menus => [:issues],
64 64 :versions => [:index, :show, :status_by],
65 65 :journals => :index,
66 66 :queries => :index,
67 67 :reports => [:issue_report, :issue_report_details]}
68 68 map.permission :add_issues, {:issues => [:new, :create, :update_form]}
69 69 map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
70 70 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
71 71 map.permission :manage_subtasks, {}
72 72 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
73 73 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
74 74 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
75 75 map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
76 76 map.permission :delete_issues, {:issues => :destroy}, :require => :member
77 77 # Queries
78 78 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
79 79 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
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 => [:new, :create, :edit, :update]}, :require => :loggedin
88 88 map.permission :view_time_entries, :timelog => [:index], :time_entry_reports => [:report]
89 89 map.permission :edit_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :member
90 90 map.permission :edit_own_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin
91 91 map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
92 92 end
93 93
94 94 map.project_module :news do |map|
95 95 map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
96 96 map.permission :view_news, {:news => [:index, :show]}, :public => true
97 97 map.permission :comment_news, {:comments => :create}
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, {:files => [:new, :create]}, :require => :loggedin
107 107 map.permission :view_files, :files => :index, :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, :show, :special, :date_index]
115 115 map.permission :export_wiki_pages, :wiki => [:export]
116 116 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
117 117 map.permission :edit_wiki_pages, :wiki => [:edit, :update, :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
139 139 map.project_module :calendar do |map|
140 140 map.permission :view_calendar, :calendars => [:show, :update]
141 141 end
142 142
143 143 map.project_module :gantt do |map|
144 144 map.permission :view_gantt, :gantts => [:show, :update]
145 145 end
146 146 end
147 147
148 148 Redmine::MenuManager.map :top_menu do |menu|
149 149 menu.push :home, :home_path
150 150 menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
151 151 menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
152 152 menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
153 153 menu.push :help, Redmine::Info.help_url, :last => true
154 154 end
155 155
156 156 Redmine::MenuManager.map :account_menu do |menu|
157 157 menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
158 158 menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
159 159 menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
160 160 menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
161 161 end
162 162
163 163 Redmine::MenuManager.map :application_menu do |menu|
164 164 # Empty
165 165 end
166 166
167 167 Redmine::MenuManager.map :admin_menu do |menu|
168 168 menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
169 169 menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
170 170 menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
171 171 menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
172 172 menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
173 173 menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
174 174 :html => {:class => 'issue_statuses'}
175 175 menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
176 176 menu.push :custom_fields, {:controller => 'custom_fields'}, :caption => :label_custom_field_plural,
177 177 :html => {:class => 'custom_fields'}
178 178 menu.push :enumerations, {:controller => 'enumerations'}
179 179 menu.push :settings, {:controller => 'settings'}
180 180 menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'},
181 181 :html => {:class => 'server_authentication'}
182 182 menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
183 183 menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
184 184 end
185 185
186 186 Redmine::MenuManager.map :project_menu do |menu|
187 187 menu.push :overview, { :controller => 'projects', :action => 'show' }
188 188 menu.push :activity, { :controller => 'activities', :action => 'index' }
189 189 menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
190 190 :if => Proc.new { |p| p.shared_versions.any? }
191 191 menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
192 192 menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
193 193 :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
194 menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
195 menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
194 196 menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
195 197 menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
196 198 menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
197 199 :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
198 200 menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
199 201 :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
200 202 menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
201 203 menu.push :repository, { :controller => 'repositories', :action => 'show' },
202 204 :if => Proc.new { |p| p.repository && !p.repository.new_record? }
203 205 menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
204 206 end
205 207
206 208 Redmine::Activity.map do |activity|
207 209 activity.register :issues, :class_name => %w(Issue Journal)
208 210 activity.register :changesets
209 211 activity.register :news
210 212 activity.register :documents, :class_name => %w(Document Attachment)
211 213 activity.register :files, :class_name => 'Attachment'
212 214 activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
213 215 activity.register :messages, :default => false
214 216 activity.register :time_entries, :default => false
215 217 end
216 218
217 219 Redmine::Search.map do |search|
218 220 search.register :issues
219 221 search.register :news
220 222 search.register :documents
221 223 search.register :changesets
222 224 search.register :wiki_pages
223 225 search.register :messages
224 226 search.register :projects
225 227 end
226 228
227 229 Redmine::WikiFormatting.map do |format|
228 230 format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
229 231 end
@@ -1,84 +1,86
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2009 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.dirname(__FILE__) + '/../../test_helper'
19 19
20 20 module RedmineMenuTestHelper
21 21 # Assertions
22 22 def assert_number_of_items_in_menu(menu_name, count)
23 23 assert Redmine::MenuManager.items(menu_name).size >= count, "Menu has less than #{count} items"
24 24 end
25 25
26 26 def assert_menu_contains_item_named(menu_name, item_name)
27 27 assert Redmine::MenuManager.items(menu_name).collect(&:name).include?(item_name.to_sym), "Menu did not have an item named #{item_name}"
28 28 end
29 29
30 30 # Helpers
31 31 def get_menu_item(menu_name, item_name)
32 32 Redmine::MenuManager.items(menu_name).find {|item| item.name == item_name.to_sym}
33 33 end
34 34 end
35 35
36 36 class RedmineTest < ActiveSupport::TestCase
37 37 include RedmineMenuTestHelper
38 38
39 39 def test_top_menu
40 40 assert_number_of_items_in_menu :top_menu, 5
41 41 assert_menu_contains_item_named :top_menu, :home
42 42 assert_menu_contains_item_named :top_menu, :my_page
43 43 assert_menu_contains_item_named :top_menu, :projects
44 44 assert_menu_contains_item_named :top_menu, :administration
45 45 assert_menu_contains_item_named :top_menu, :help
46 46 end
47 47
48 48 def test_account_menu
49 49 assert_number_of_items_in_menu :account_menu, 4
50 50 assert_menu_contains_item_named :account_menu, :login
51 51 assert_menu_contains_item_named :account_menu, :register
52 52 assert_menu_contains_item_named :account_menu, :my_account
53 53 assert_menu_contains_item_named :account_menu, :logout
54 54 end
55 55
56 56 def test_application_menu
57 57 assert_number_of_items_in_menu :application_menu, 0
58 58 end
59 59
60 60 def test_admin_menu
61 61 assert_number_of_items_in_menu :admin_menu, 0
62 62 end
63 63
64 64 def test_project_menu
65 assert_number_of_items_in_menu :project_menu, 12
65 assert_number_of_items_in_menu :project_menu, 14
66 66 assert_menu_contains_item_named :project_menu, :overview
67 67 assert_menu_contains_item_named :project_menu, :activity
68 68 assert_menu_contains_item_named :project_menu, :roadmap
69 69 assert_menu_contains_item_named :project_menu, :issues
70 70 assert_menu_contains_item_named :project_menu, :new_issue
71 assert_menu_contains_item_named :project_menu, :calendar
72 assert_menu_contains_item_named :project_menu, :gantt
71 73 assert_menu_contains_item_named :project_menu, :news
72 74 assert_menu_contains_item_named :project_menu, :documents
73 75 assert_menu_contains_item_named :project_menu, :wiki
74 76 assert_menu_contains_item_named :project_menu, :boards
75 77 assert_menu_contains_item_named :project_menu, :files
76 78 assert_menu_contains_item_named :project_menu, :repository
77 79 assert_menu_contains_item_named :project_menu, :settings
78 80 end
79 81
80 82 def test_new_issue_should_have_root_as_a_parent
81 83 new_issue = get_menu_item(:project_menu, :new_issue)
82 84 assert_equal :root, new_issue.parent.name
83 85 end
84 86 end
General Comments 0
You need to be logged in to leave comments. Login now