Sync with trunk r1778.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1779 e93f8b46-1217-0410-a6f0-8f06a7374b81

groups/app/controllers/application.rb

@@ -95,11 +95,15 @@ class ApplicationController < ActionController::Base
     end
     true
   end
+  
+  def deny_access
+    User.current.logged? ? render_403 : require_login
+  end
 
   # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action])
     allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
-    allowed ? true : (User.current.logged? ? render_403 : require_login)
+    allowed ? true : deny_access
   end
   
   # make sure that the user is a member of the project (or admin) if project is private

groups/app/controllers/projects_controller.rb

@@ -69,6 +69,7 @@ class ProjectsController < ApplicationController
                                   :order => 'name')
     @project = Project.new(params[:project])
     if request.get?
+      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
       @project.trackers = Tracker.all
       @project.is_public = Setting.default_projects_public?
       @project.enabled_module_names = Redmine::AccessControl.available_project_modules

groups/app/controllers/timelog_controller.rb

@@ -17,7 +17,8 @@
 
 class TimelogController < ApplicationController
   menu_item :issues
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize, :only => [:edit, :destroy]
+  before_filter :find_optional_project, :only => [:report, :details]
 
   verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
   
@@ -53,11 +54,12 @@ class TimelogController < ApplicationController
                            }
     
     # Add list and boolean custom fields as available criterias
-    @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+    custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
+    custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
       @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
                                              :format => cf.field_format,
                                              :label => cf.name}
-    end
+    end if @project
     
     # Add list and boolean time entry custom fields
     TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
@@ -83,9 +85,10 @@ class TimelogController < ApplicationController
       sql << " FROM #{TimeEntry.table_name}"
       sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
       sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
-      sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
-      sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
-      sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
+      sql << " WHERE"
+      sql << " (%s) AND" % @project.project_condition(Setting.display_subprojects_issues?) if @project
+      sql << " (%s) AND" % Project.allowed_to_condition(User.current, :view_time_entries)
+      sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
       sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
       
       @hours = ActiveRecord::Base.connection.select_all(sql)
@@ -138,8 +141,13 @@ class TimelogController < ApplicationController
     sort_update
     
     cond = ARCondition.new
-    cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
-                           ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
+    if @project.nil?
+      cond << Project.allowed_to_condition(User.current, :view_time_entries)
+    elsif @issue.nil?
+      cond << @project.project_condition(Setting.display_subprojects_issues?)
+    else
+      cond << ["#{TimeEntry.table_name}.issue_id = ?", @issue.id]
+    end
     
     retrieve_date_range
     cond << ['spent_on BETWEEN ? AND ?', @from, @to]
@@ -197,7 +205,7 @@ class TimelogController < ApplicationController
     @time_entry.destroy
     flash[:notice] = l(:notice_successful_delete)
     redirect_to :back
-  rescue RedirectBackError
+  rescue ::ActionController::RedirectBackError
     redirect_to :action => 'details', :project_id => @time_entry.project
   end
 
@@ -219,6 +227,16 @@ private
     render_404
   end
   
+  def find_optional_project
+    if !params[:issue_id].blank?
+      @issue = Issue.find(params[:issue_id])
+      @project = @issue.project
+    elsif !params[:project_id].blank?
+      @project = Project.find(params[:project_id])
+    end
+    deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
+  end
+  
   # Retrieves the date range based on predefined ranges or specific from/to param dates
   def retrieve_date_range
     @free_period = false
@@ -261,7 +279,7 @@ private
     end
     
     @from, @to = @to, @from if @from && @to && @from > @to
-    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today) - 1
-    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today)
+    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today) - 1
+    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today)
   end
 end

groups/app/helpers/settings_helper.rb

@@ -19,6 +19,7 @@ module SettingsHelper
   def administration_settings_tabs
     tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
             {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
+            {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
             {:name => 'notifications', :partial => 'settings/notifications', :label => l(:field_mail_notification)},
             {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => l(:label_incoming_emails)},

groups/app/helpers/timelog_helper.rb

@@ -16,6 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module TimelogHelper
+  def render_timelog_breadcrumb
+    links = []
+    links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
+    links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
+    links << link_to_issue(@issue) if @issue
+    breadcrumb links
+  end
+  
   def activity_collection_for_select_options
     activities = Enumeration::get_values('ACTI')
     collection = []

groups/app/models/project.rb

@@ -239,6 +239,12 @@ class Project < ActiveRecord::Base
       enabled_modules << EnabledModule.new(:name => name.to_s)
     end
   end
+  
+  # Returns an auto-generated project identifier based on the last identifier used
+  def self.next_identifier
+    p = Project.find(:first, :order => 'created_on DESC')
+    p.nil? ? nil : p.identifier.to_s.succ
+  end
 
 protected
   def validate

groups/app/models/user.rb

@@ -269,7 +269,7 @@ class User < ActiveRecord::Base
     elsif options[:global]
       # authorize if user has at least one role that has this permission
       roles = memberships.collect {|m| m.role}.uniq
-      roles.detect {|r| r.allowed_to?(action)}
+      roles.detect {|r| r.allowed_to?(action)} || (self.logged? ? Role.non_member.allowed_to?(action) : Role.anonymous.allowed_to?(action))
     else
       false
     end

groups/app/views/settings/_general.rhtml

@@ -46,9 +46,6 @@
 
 <p><label><%= l(:setting_feeds_limit) %></label>
 <%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
-
-<p><label><%= l(:setting_default_projects_public) %></label>
-<%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %><%= hidden_field_tag 'settings[default_projects_public]', 0 %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>

groups/app/views/settings/_projects.rhtml

@@ -0,0 +1,12 @@
+<% form_tag({:action => 'edit', :tab => 'projects'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:setting_default_projects_public) %></label>
+<%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %><%= hidden_field_tag 'settings[default_projects_public]', 0 %></p>
+
+<p><label><%= l(:setting_sequential_project_identifiers) %></label>
+<%= check_box_tag 'settings[sequential_project_identifiers]', 1, Setting.sequential_project_identifiers? %><%= hidden_field_tag 'settings[sequential_project_identifiers]', 0 %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>

groups/app/views/timelog/details.rhtml

@@ -2,11 +2,9 @@
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
 </div>
 
-<h2><%= l(:label_spent_time) %></h2>
+<%= render_timelog_breadcrumb %>
 
-<% if @issue %>
-<h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) %> / <%= link_to_issue(@issue) %></h3>
-<% end %>
+<h2><%= l(:label_spent_time) %></h2>
 
 <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
 <%= hidden_field_tag 'project_id', params[:project_id] %>

groups/app/views/timelog/report.rhtml

@@ -2,6 +2,8 @@
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
 </div>
 
+<%= render_timelog_breadcrumb %>
+
 <h2><%= l(:label_spent_time) %></h2>
 
 <% form_remote_tag(:url => {}, :update => 'content') do %>

groups/config/routes.rb

@@ -22,7 +22,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'projects/:project_id/news/:action', :controller => 'news'
   map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
   map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
-  map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog'
+  map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
   map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
 
   map.with_options :controller => 'repositories' do |omap|

groups/config/settings.yml

@@ -118,6 +118,8 @@ display_subprojects_issues:
   default: 1
 default_projects_public:
   default: 1
+sequential_project_identifiers:
+  default: 0
 # encodings used to convert repository files content to UTF-8
 # multiple values accepted, comma separated
 repositories_encodings:

groups/extra/svn/Redmine.pm

@@ -200,7 +200,7 @@ sub access_handler {
   }
 
   my $method = $r->method;
-  return OK if defined $read_only_methods{$method};
+  return OK unless defined $read_only_methods{$method};
 
   my $project_id = get_project_identifier($r);
 

groups/lang/bg.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/cs.yml

@@ -641,3 +641,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/da.yml

@@ -638,3 +638,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/de.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/en.yml

@@ -220,6 +220,7 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 setting_enabled_scm: Enabled SCM
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+setting_sequential_project_identifiers: Generate sequential project identifiers
 
 project_module_issue_tracking: Issue tracking
 project_module_time_tracking: Time tracking

groups/lang/es.yml

@@ -639,3 +639,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/fi.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/fr.yml

@@ -220,6 +220,7 @@ setting_display_subprojects_issues: Afficher par défaut les demandes des sous-p
 setting_enabled_scm: SCM activés
 setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
 setting_mail_handler_api_key: Clé de protection de l'API
+setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels
 
 project_module_issue_tracking: Suivi des demandes
 project_module_time_tracking: Suivi du temps passé

groups/lang/he.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/hu.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/it.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/ja.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/ko.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/lt.yml

@@ -639,3 +639,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/nl.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/no.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/pl.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/pt-br.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/pt.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/ro.yml

@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/ru.yml

@@ -640,3 +640,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/sr.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/sv.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/th.yml

@@ -639,3 +639,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/uk.yml

@@ -638,3 +638,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/zh-tw.yml

@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/lang/zh.yml

@@ -637,3 +637,4 @@ enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers

groups/test/functional/timelog_controller_test.rb

@@ -78,7 +78,7 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_equal 2, entry.user_id
   end
   
-  def destroy
+  def test_destroy
     @request.session[:user_id] = 2
     post :destroy, :id => 1
     assert_redirected_to 'projects/ecookbook/timelog/details'
@@ -91,6 +91,29 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_template 'report'
   end
 
+  def test_report_all_projects
+    get :report
+    assert_response :success
+    assert_template 'report'
+  end
+  
+  def test_report_all_projects_denied
+    r = Role.anonymous
+    r.permissions.delete(:view_time_entries)
+    r.permissions_will_change!
+    r.save
+    get :report
+    assert_redirected_to '/account/login'
+  end
+  
+  def test_report_all_projects_one_criteria
+    get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
+    assert_response :success
+    assert_template 'report'
+    assert_not_nil assigns(:total_hours)
+    assert_equal "8.65", "%.2f" % assigns(:total_hours)
+  end
+
   def test_report_all_time
     get :report, :project_id => 1, :criterias => ['project', 'issue']
     assert_response :success
@@ -148,7 +171,18 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:total_hours)
     assert_equal "0.00", "%.2f" % assigns(:total_hours)
   end
- 
+  
+  def test_report_all_projects_csv_export
+    get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
+    assert_response :success
+    assert_equal 'text/csv', @response.content_type
+    lines = @response.body.chomp.split("\n")
+    # Headers
+    assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
+    # Total row
+    assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
+  end
+  
   def test_report_csv_export
     get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
     assert_response :success
@@ -159,6 +193,14 @@ class TimelogControllerTest < Test::Unit::TestCase
     # Total row
     assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
   end
+  
+  def test_details_all_projects
+    get :details
+    assert_response :success
+    assert_template 'details'
+    assert_not_nil assigns(:total_hours)
+    assert_equal "162.90", "%.2f" % assigns(:total_hours)
+  end
 
   def test_details_at_project_level
     get :details, :project_id => 1
@@ -218,6 +260,14 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert assigns(:items).first.is_a?(TimeEntry)
   end
   
+  def test_details_all_projects_csv_export
+    get :details, :format => 'csv'
+    assert_response :success
+    assert_equal 'text/csv', @response.content_type
+    assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
+    assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
+  end
+  
   def test_details_csv_export
     get :details, :project_id => 1, :format => 'csv'
     assert_response :success

groups/test/unit/project_test.rb

@@ -130,4 +130,15 @@ class ProjectTest < Test::Unit::TestCase
     assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
     assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
   end
+  
+  def test_next_identifier
+    ProjectCustomField.delete_all
+    Project.create!(:name => 'last', :identifier => 'p2008040')
+    assert_equal 'p2008041', Project.next_identifier
+  end
+  
+  def test_next_identifier_first_project
+    Project.delete_all
+    assert_nil Project.next_identifier
+  end
 end