diff --git a/redmine/app/controllers/account_controller.rb b/redmine/app/controllers/account_controller.rb index d5c98f5..54e0ef7 100644 --- a/redmine/app/controllers/account_controller.rb +++ b/redmine/app/controllers/account_controller.rb @@ -16,31 +16,30 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class AccountController < ApplicationController - layout 'base' + layout 'base' + # prevents login action to be filtered by check_if_login_required application scope filter skip_before_filter :check_if_login_required, :only => :login - before_filter :require_login, :except => [:show, :login] + before_filter :require_login, :except => [:show, :login] - def show - @user = User.find(params[:id]) - end - - # Login request and validation - def login - if request.get? - session[:user] = nil - @user = User.new - else - @user = User.new(params[:user]) - logged_in_user = @user.try_to_login - if logged_in_user - session[:user] = logged_in_user - redirect_back_or_default :controller => 'account', :action => 'my_page' - else - flash[:notice] = _('Invalid user/password') - end - end - end + def show + @user = User.find(params[:id]) + end + + # Login request and validation + def login + if request.get? + session[:user] = nil + else + logged_in_user = User.try_to_login(params[:login], params[:password]) + if logged_in_user + session[:user] = logged_in_user + redirect_back_or_default :controller => 'account', :action => 'my_page' + else + flash[:notice] = _('Invalid user/password') + end + end + end # Log out current user and redirect to welcome page def logout @@ -64,20 +63,15 @@ class AccountController < ApplicationController end end - # Change current user's password - def change_password - @user = User.find(session[:user].id) - if @user.check_password?(@params[:old_password]) - if @params[:new_password] == @params[:new_password_confirmation] - if @user.change_password(@params[:old_password], @params[:new_password]) - flash[:notice] = 'Password was successfully updated.' - end - else - flash[:notice] = 'Password confirmation doesn\'t match!' - end - else - flash[:notice] = 'Wrong password' - end - render :action => 'my_account' - end + # Change current user's password + def change_password + @user = User.find(session[:user].id) + if @user.check_password?(@params[:password]) + @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation] + flash[:notice] = 'Password was successfully updated.' if @user.save + else + flash[:notice] = 'Wrong password' + end + render :action => 'my_account' + end end diff --git a/redmine/app/controllers/admin_controller.rb b/redmine/app/controllers/admin_controller.rb index fa34baf..68d0813 100644 --- a/redmine/app/controllers/admin_controller.rb +++ b/redmine/app/controllers/admin_controller.rb @@ -16,26 +16,32 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class AdminController < ApplicationController - layout 'base' - before_filter :require_admin - - helper :sort - include SortHelper + layout 'base' + before_filter :require_admin + + helper :sort + include SortHelper - def index - end + def index + end def projects - sort_init 'projects.name', 'asc' - sort_update - @project_pages, @projects = paginate :projects, :per_page => 15, :order => sort_clause + sort_init 'name', 'asc' + sort_update + @project_count = Project.count + @project_pages = Paginator.new self, @project_count, + 15, + @params['page'] + @projects = Project.find :all, :order => sort_clause, + :limit => @project_pages.items_per_page, + :offset => @project_pages.current.offset end - + def mail_options - @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || [] + @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || [] if request.post? @actions.each { |a| - a.mail_enabled = params[:action_ids].include? a.id.to_s + a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s a.save } flash[:notice] = "Mail options were successfully updated." @@ -44,6 +50,5 @@ class AdminController < ApplicationController def info @adapter_name = ActiveRecord::Base.connection.adapter_name - end - + end end diff --git a/redmine/app/controllers/application.rb b/redmine/app/controllers/application.rb index a9dd6b8..9cc37cf 100644 --- a/redmine/app/controllers/application.rb +++ b/redmine/app/controllers/application.rb @@ -24,63 +24,73 @@ class ApplicationController < ActionController::Base end def set_localization - Localization.lang = session[:user].nil? ? RDM_DEFAULT_LANG : (session[:user].language || RDM_DEFAULT_LANG) + Localization.lang = begin + if session[:user] + session[:user].language + elsif request.env['HTTP_ACCEPT_LANGUAGE'] + accept_lang = HTTPUtils.parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first + if Localization.langs.collect{ |l| l[1] }.include? accept_lang + accept_lang + end + end + rescue + nil + end || RDM_DEFAULT_LANG end - def require_login - unless session[:user] - store_location - redirect_to(:controller => "account", :action => "login") - end - end + def require_login + unless session[:user] + store_location + redirect_to(:controller => "account", :action => "login") + end + end - def require_admin - if session[:user].nil? - store_location - redirect_to(:controller => "account", :action => "login") - else - unless session[:user].admin? - flash[:notice] = "Acces not allowed" - redirect_to(:controller => "projects", :action => "list") - end - end - end + def require_admin + if session[:user].nil? + store_location + redirect_to(:controller => "account", :action => "login") + else + unless session[:user].admin? + flash[:notice] = "Acces not allowed" + redirect_to(:controller => "projects", :action => "list") + end + end + end - # authorizes the user for the requested action. - def authorize + # authorizes the user for the requested action. + def authorize # check if action is allowed on public projects - if @project.public? and Permission.allowed_to_public "%s/%s" % [ @params[:controller], @params[:action] ] + if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ @params[:controller], @params[:action] ] return true end - # if user is not logged in, he is redirect to login form - unless session[:user] - store_location - redirect_to(:controller => "account", :action => "login") - return false - end - # check if user is authorized + # if user not logged in, redirect to login form + unless session[:user] + store_location + redirect_to(:controller => "account", :action => "login") + return false + end + # if logged in, check if authorized if session[:user].admin? or Permission.allowed_to_role( "%s/%s" % [ @params[:controller], @params[:action] ], session[:user].role_for_project(@project.id) ) return true - end + end flash[:notice] = "Acces denied" redirect_to(:controller => "") - return false - end + false + end - # store current uri in the session. - # we can return to this location by calling redirect_back_or_default - def store_location - session[:return_to] = @request.request_uri - end - - # move to the last store_location call or to the passed default one - def redirect_back_or_default(default) - if session[:return_to].nil? - redirect_to default - else - redirect_to_url session[:return_to] - session[:return_to] = nil - end - end - + # store current uri in session. + # return to this location by calling redirect_back_or_default + def store_location + session[:return_to] = @request.request_uri + end + + # move to the last store_location call or to the passed default one + def redirect_back_or_default(default) + if session[:return_to].nil? + redirect_to default + else + redirect_to_url session[:return_to] + session[:return_to] = nil + end + end end \ No newline at end of file diff --git a/redmine/app/controllers/help_controller.rb b/redmine/app/controllers/help_controller.rb index 4b555d5..e51d077 100644 --- a/redmine/app/controllers/help_controller.rb +++ b/redmine/app/controllers/help_controller.rb @@ -16,28 +16,32 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class HelpController < ApplicationController - + skip_before_filter :check_if_login_required - before_filter :load_help_config + before_filter :load_help_config - def index - if @params[:ctrl] and @help_config[@params[:ctrl]] - if @params[:page] and @help_config[@params[:ctrl]][@params[:page]] - template = @help_config[@params[:ctrl]][@params[:page]] - else - template = @help_config[@params[:ctrl]]['index'] - end - end - + # displays help page for the requested controller/action + def index + # select help page to display + if @params[:ctrl] and @help_config['pages'][@params[:ctrl]] + if @params[:page] and @help_config['pages'][@params[:ctrl]][@params[:page]] + template = @help_config['pages'][@params[:ctrl]][@params[:page]] + else + template = @help_config['pages'][@params[:ctrl]]['index'] + end + end + # choose language according to available help translations + lang = (@help_config['langs'].include? Localization.lang) ? Localization.lang : @help_config['langs'].first + if template - redirect_to "/manual/#{template}" + redirect_to "/manual/#{lang}/#{template}" else - redirect_to "/manual/" + redirect_to "/manual/#{lang}/" end - end + end private - def load_help_config - @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml")) - end + def load_help_config + @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml")) + end end diff --git a/redmine/app/controllers/projects_controller.rb b/redmine/app/controllers/projects_controller.rb index a9737aa..2bef221 100644 --- a/redmine/app/controllers/projects_controller.rb +++ b/redmine/app/controllers/projects_controller.rb @@ -32,58 +32,62 @@ class ProjectsController < ApplicationController render :action => 'list' end - # Lists public projects - def list - sort_init 'projects.name', 'asc' - sort_update - @project_count = Project.count(["public=?", true]) - @project_pages = Paginator.new self, @project_count, + # Lists public projects + def list + sort_init 'name', 'asc' + sort_update + @project_count = Project.count(["is_public=?", true]) + @project_pages = Paginator.new self, @project_count, 15, @params['page'] - @projects = Project.find :all, :order => sort_clause, - :conditions => ["public=?", true], + @projects = Project.find :all, :order => sort_clause, + :conditions => ["is_public=?", true], :limit => @project_pages.items_per_page, :offset => @project_pages.current.offset end # Add a new project - def add - @custom_fields = CustomField::find_all - @project = Project.new(params[:project]) - if request.post? - @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids] - if @project.save - flash[:notice] = 'Project was successfully created.' - redirect_to :controller => 'admin', :action => 'projects' - end - end - end + def add + @custom_fields = CustomField::find_all + @root_projects = Project::find(:all, :conditions => "parent_id is null") + @project = Project.new(params[:project]) + if request.post? + @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids] + if @project.save + flash[:notice] = 'Project was successfully created.' + redirect_to :controller => 'admin', :action => 'projects' + end + end + end - # Show @project - def show - @members = @project.members.find(:all, :include => [:user, :role]) - end + # Show @project + def show + @members = @project.members.find(:all, :include => [:user, :role]) + @subprojects = @project.children if @project.children_count > 0 + @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC") + end def settings - @custom_fields = CustomField::find_all - @issue_category ||= IssueCategory.new + @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id]) + @custom_fields = CustomField::find_all + @issue_category ||= IssueCategory.new @member ||= @project.members.new @roles = Role.find_all @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user } end - # Edit @project - def edit - if request.post? - @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids] - if @project.update_attributes(params[:project]) - flash[:notice] = 'Project was successfully updated.' - redirect_to :action => 'settings', :id => @project + # Edit @project + def edit + if request.post? + @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids] + if @project.update_attributes(params[:project]) + flash[:notice] = 'Project was successfully updated.' + redirect_to :action => 'settings', :id => @project else settings render :action => 'settings' - end - end + end + end end # Delete @project @@ -181,7 +185,7 @@ class ProjectsController < ApplicationController end end - # Show issues list of @project + # Show filtered/sorted issues list of @project def list_issues sort_init 'issues.id', 'desc' sort_update @@ -189,10 +193,10 @@ class ProjectsController < ApplicationController search_filter_init_list_issues search_filter_update if params[:set_filter] or request.post? - @issue_count = Issue.count(:include => :status, :conditions => search_filter_clause) + @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause) @issue_pages = Paginator.new self, @issue_count, 15, @params['page'] @issues = Issue.find :all, :order => sort_clause, - :include => [ :author, :status, :tracker ], + :include => [ :author, :status, :tracker, :project ], :conditions => search_filter_clause, :limit => @issue_pages.items_per_page, :offset => @issue_pages.current.offset @@ -206,7 +210,7 @@ class ProjectsController < ApplicationController search_filter_init_list_issues @issues = Issue.find :all, :order => sort_clause, - :include => [ :author, :status, :tracker ], + :include => [ :author, :status, :tracker, :project ], :conditions => search_filter_clause export = StringIO.new diff --git a/redmine/app/controllers/roles_controller.rb b/redmine/app/controllers/roles_controller.rb index 6e4fc74..657f62e 100644 --- a/redmine/app/controllers/roles_controller.rb +++ b/redmine/app/controllers/roles_controller.rb @@ -62,9 +62,6 @@ class RolesController < ApplicationController end def workflow - @roles = Role.find_all - @trackers = Tracker.find_all - @statuses = IssueStatus.find_all @role = Role.find_by_id(params[:role_id]) @tracker = Tracker.find_by_id(params[:tracker_id]) @@ -80,5 +77,8 @@ class RolesController < ApplicationController flash[:notice] = 'Workflow was successfully updated.' end end + @roles = Role.find_all + @trackers = Tracker.find_all + @statuses = IssueStatus.find(:all, :include => :workflows) end end diff --git a/redmine/app/controllers/users_controller.rb b/redmine/app/controllers/users_controller.rb index 64c9fd3..3a60427 100644 --- a/redmine/app/controllers/users_controller.rb +++ b/redmine/app/controllers/users_controller.rb @@ -16,58 +16,62 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class UsersController < ApplicationController - layout 'base' - before_filter :require_admin - - helper :sort - include SortHelper - - def index - list - render :action => 'list' - end + layout 'base' + before_filter :require_admin + + helper :sort + include SortHelper + + def index + list + render :action => 'list' + end - def list - sort_init 'users.login', 'asc' - sort_update - @user_count = User.count - @user_pages = Paginator.new self, @user_count, + def list + sort_init 'login', 'asc' + sort_update + @user_count = User.count + @user_pages = Paginator.new self, @user_count, 15, @params['page'] - @users = User.find :all, :order => sort_clause, + @users = User.find :all,:order => sort_clause, :limit => @user_pages.items_per_page, :offset => @user_pages.current.offset - end + end - def add - if request.get? - @user = User.new - else - @user = User.new(params[:user]) - @user.admin = params[:user][:admin] - if @user.save - flash[:notice] = 'User was successfully created.' - redirect_to :action => 'list' - end - end - end + def add + if request.get? + @user = User.new + else + @user = User.new(params[:user]) + @user.admin = params[:user][:admin] || false + @user.login = params[:user][:login] + @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] + if @user.save + flash[:notice] = 'User was successfully created.' + redirect_to :action => 'list' + end + end + end - def edit - @user = User.find(params[:id]) - if request.post? - @user.admin = params[:user][:admin] if params[:user][:admin] - if @user.update_attributes(params[:user]) - flash[:notice] = 'User was successfully updated.' - redirect_to :action => 'list' - end - end - end + def edit + @user = User.find(params[:id]) + if request.post? + @user.admin = params[:user][:admin] if params[:user][:admin] + @user.login = params[:user][:login] if params[:user][:login] + @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? + if @user.update_attributes(params[:user]) + flash[:notice] = 'User was successfully updated.' + redirect_to :action => 'list' + end + end + end - def destroy - User.find(params[:id]).destroy - redirect_to :action => 'list' + def destroy + User.find(params[:id]).destroy + redirect_to :action => 'list' rescue flash[:notice] = "Unable to delete user" redirect_to :action => 'list' - end + end end diff --git a/redmine/app/controllers/versions_controller.rb b/redmine/app/controllers/versions_controller.rb index c4fd241..c462867 100644 --- a/redmine/app/controllers/versions_controller.rb +++ b/redmine/app/controllers/versions_controller.rb @@ -38,6 +38,9 @@ class VersionsController < ApplicationController @attachment = @version.attachments.find(params[:attachment_id]) @attachment.increment_download send_file @attachment.diskfile, :filename => @attachment.filename + rescue + flash[:notice]="Requested file doesn't exist or has been deleted." + redirect_to :controller => 'projects', :action => 'list_files', :id => @project end def destroy_file diff --git a/redmine/app/helpers/application_helper.rb b/redmine/app/helpers/application_helper.rb index 4a50b94..de53f2a 100644 --- a/redmine/app/helpers/application_helper.rb +++ b/redmine/app/helpers/application_helper.rb @@ -27,7 +27,7 @@ module ApplicationHelper def authorize_for(controller, action) # check if action is allowed on public projects - if @project.public? and Permission.allowed_to_public "%s/%s" % [ controller, action ] + if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ] return true end # check if user is authorized diff --git a/redmine/app/helpers/search_filter_helper.rb b/redmine/app/helpers/search_filter_helper.rb index 7acc8b2..0999dfb 100644 --- a/redmine/app/helpers/search_filter_helper.rb +++ b/redmine/app/helpers/search_filter_helper.rb @@ -18,68 +18,73 @@ module SearchFilterHelper def search_filter_criteria(name, options = {}) - session[:search_filter] ||= {} - session[:search_filter][name] ||= {} - unless session[:search_filter][name][:options] and session[:search_filter][name][:conditions] - session[:search_filter][name][:options] = [] - session[:search_filter][name][:conditions] = {} - yield.each { |c| - session[:search_filter][name][:options] << [c[0], c[1].to_s] - session[:search_filter][name][:conditions].store(c[1].to_s, c[2]) - } - end + @search_filter ||= {} + @search_filter[name] ||= {} + @search_filter[name][:options] = [] + @search_filter[name][:conditions] = {} + yield.each { |c| + @search_filter[name][:options] << [c[0], c[1].to_s] + @search_filter[name][:conditions].store(c[1].to_s, c[2]) + } end def search_filter_update - session[:search_filter].each_key {|field| session[:search_filter][field][:value] = params[field] } + @search_filter.each_key {|field| session[:search_filter][field] = params[field] } end def search_filter_clause - clause = ["issues.project_id=?", @project.id] - session[:search_filter].each { |k, v| - v[:value] ||= v[:options][0][1] - if (!v[:conditions][v[:value]][0].empty?) - clause[0] = clause[0] + " AND " + v[:conditions][v[:value]][0] - clause << v[:conditions][v[:value]][1] if !v[:conditions][v[:value]][1].nil? + clause = ["1=1"] + @search_filter.each { |k, v| + filter_value = session[:search_filter][k] || v[:options][0][1] + if v[:conditions][filter_value] + clause[0] = clause[0] + " AND " + v[:conditions][filter_value].first + clause += v[:conditions][filter_value][1..-1] end } clause end - def search_filter_tag(criteria) + def search_filter_tag(criteria, options = {}) + options[:name] = criteria content_tag("select", - options_for_select(session[:search_filter][criteria][:options], session[:search_filter][criteria][:value]), - :name => criteria + options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]), + options ) end def search_filter_init_list_issues search_filter_criteria('status_id') { - [ ["[Open]", "O", ["issue_statuses.is_closed=?", false]], - ["[All]", "A", ["", false]] + [ [_('[Open]'), "O", ["issue_statuses.is_closed=?", false]], + [_('[All]'), "A", nil] ] + IssueStatus.find(:all).collect {|s| [s.name, s.id, ["issues.status_id=?", s.id]] } } search_filter_criteria('tracker_id') { - [ ["[All]", "A", ["", false]] + [ [_('[All]'), "A", nil] ] + Tracker.find(:all).collect {|s| [s.name, s.id, ["issues.tracker_id=?", s.id]] } } search_filter_criteria('priority_id') { - [ ["[All]", "A", ["", false]] + [ [_('[All]'), "A", nil] ] + Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect {|s| [s.name, s.id, ["issues.priority_id=?", s.id]] } } search_filter_criteria('category_id') { - [ ["[All]", "A", ["", false]], - ["[None]", "N", ["issues.category_id is null"]] + [ [_('[All]'), "A", nil], + [_('[None]'), "N", ["issues.category_id is null"]] ] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] } } search_filter_criteria('assigned_to_id') { - [ ["[All]", "A", ["", false]], - ["[Nobody]", "N", ["issues.assigned_to_id is null"]] - ] + User.find(:all).collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] } - } + [ [_('[All]'), "A", nil], + [_('[None]'), "N", ["issues.assigned_to_id is null"]] + ] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] } + } + + search_filter_criteria('subproject_id') { + [ [_('[None]'), "N", ["issues.project_id=?", @project.id]], + [_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]] + ] + } end end \ No newline at end of file diff --git a/redmine/app/models/attachment.rb b/redmine/app/models/attachment.rb index bc1ff5d..1e5bd22 100644 --- a/redmine/app/models/attachment.rb +++ b/redmine/app/models/attachment.rb @@ -30,7 +30,7 @@ class Attachment < ActiveRecord::Base self.filename = sanitize_filename(@temp_file.original_filename) self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename self.content_type = @temp_file.content_type - self.size = @temp_file.size + self.filesize = @temp_file.size end end end diff --git a/redmine/app/models/enumeration.rb b/redmine/app/models/enumeration.rb index d93db44..7f985d2 100644 --- a/redmine/app/models/enumeration.rb +++ b/redmine/app/models/enumeration.rb @@ -19,6 +19,7 @@ class Enumeration < ActiveRecord::Base before_destroy :check_integrity validates_presence_of :opt, :name + validates_uniqueness_of :name, :scope => [:opt] OPTIONS = [ ["Issue priorities", "IPRI"], diff --git a/redmine/app/models/issue_category.rb b/redmine/app/models/issue_category.rb index b7d4e26..74adb8f 100644 --- a/redmine/app/models/issue_category.rb +++ b/redmine/app/models/issue_category.rb @@ -17,9 +17,10 @@ class IssueCategory < ActiveRecord::Base before_destroy :check_integrity - belongs_to :project - + belongs_to :project + validates_presence_of :name + validates_uniqueness_of :name, :scope => [:project_id] private def check_integrity diff --git a/redmine/app/models/issue_status.rb b/redmine/app/models/issue_status.rb index ff34cb6..ef98620 100644 --- a/redmine/app/models/issue_status.rb +++ b/redmine/app/models/issue_status.rb @@ -17,24 +17,26 @@ class IssueStatus < ActiveRecord::Base before_destroy :check_integrity - has_many :workflows, :foreign_key => "old_status_id" - - validates_presence_of :name - validates_uniqueness_of :name + has_many :workflows, :foreign_key => "old_status_id" - # Returns the default status for new issues - def self.default - find(:first, :conditions =>["is_default=?", true]) - end - - # Returns an array of all statuses the given role can switch to - def new_statuses_allowed_to(role, tracker) - statuses = [] - for workflow in self.workflows.find(:all, :include => :new_status) - statuses << workflow.new_status if workflow.role_id == role.id and workflow.tracker_id == tracker.id - end unless role.nil? - statuses - end + validates_presence_of :name + validates_uniqueness_of :name + validates_length_of :html_color, :is=>6 + validates_format_of :html_color, :with => /^[a-f0-9]*$/i + + # Returns the default status for new issues + def self.default + find(:first, :conditions =>["is_default=?", true]) + end + + # Returns an array of all statuses the given role can switch to + def new_statuses_allowed_to(role, tracker) + statuses = [] + for workflow in self.workflows + statuses << workflow.new_status if workflow.role_id == role.id and workflow.tracker_id == tracker.id + end unless role.nil? or tracker.nil? + statuses + end def name _ self.attributes['name'] diff --git a/redmine/app/models/permission.rb b/redmine/app/models/permission.rb index f662141..e05ca0f 100644 --- a/redmine/app/models/permission.rb +++ b/redmine/app/models/permission.rb @@ -43,7 +43,7 @@ class Permission < ActiveRecord::Base end def self.allowed_to_public(action) - @@cached_perms_for_public ||= find(:all, :conditions => ["public=?", true]).collect {|p| "#{p.controller}/#{p.action}"} + @@cached_perms_for_public ||= find(:all, :conditions => ["is_public=?", true]).collect {|p| "#{p.controller}/#{p.action}"} @@cached_perms_for_public.include? action end diff --git a/redmine/app/models/project.rb b/redmine/app/models/project.rb index 7c50ee8..e5b5779 100644 --- a/redmine/app/models/project.rb +++ b/redmine/app/models/project.rb @@ -16,29 +16,33 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class Project < ActiveRecord::Base - has_many :versions, :dependent => true, :order => "versions.date DESC" + has_many :versions, :dependent => true, :order => "versions.effective_date DESC" has_many :members, :dependent => true + has_many :users, :through => :members has_many :issues, :dependent => true, :order => "issues.created_on DESC", :include => :status has_many :documents, :dependent => true - has_many :news, :dependent => true, :order => "news.created_on DESC", :include => :author + has_many :news, :dependent => true, :include => :author has_many :issue_categories, :dependent => true has_and_belongs_to_many :custom_fields + acts_as_tree :order => "name", :counter_cache => true validates_presence_of :name, :descr + validates_uniqueness_of :name # returns 5 last created projects def self.latest find(:all, :limit => 5, :order => "created_on DESC") end - # Returns current version of the project - def current_version - versions.find(:first, :conditions => [ "date <= ?", Date.today ], :order => "date DESC, id DESC") - end - # Returns an array of all custom fields enabled for project issues # (explictly associated custom fields and custom fields enabled for all projects) def custom_fields_for_issues (CustomField.for_all + custom_fields).uniq - end + end + +protected + def validate + errors.add(parent_id, " must be a root project") if parent and parent.parent + errors.add_to_base("A project with subprojects can't be a subproject") if parent and projects_count > 0 + end end diff --git a/redmine/app/models/tracker.rb b/redmine/app/models/tracker.rb index 6b123d7..4283f47 100644 --- a/redmine/app/models/tracker.rb +++ b/redmine/app/models/tracker.rb @@ -20,6 +20,9 @@ class Tracker < ActiveRecord::Base has_many :issues has_many :workflows, :dependent => true + validates_presence_of :name + validates_uniqueness_of :name + def name _ self.attributes['name'] end diff --git a/redmine/app/models/user.rb b/redmine/app/models/user.rb index 1bc1b58..e0adbb0 100644 --- a/redmine/app/models/user.rb +++ b/redmine/app/models/user.rb @@ -18,58 +18,46 @@ require "digest/sha1" class User < ActiveRecord::Base - has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => true + has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => true - attr_accessor :password - attr_accessor :last_before_login_on - # Prevents unauthorized assignments - attr_protected :admin + attr_accessor :password, :password_confirmation + attr_accessor :last_before_login_on + # Prevents unauthorized assignments + attr_protected :login, :admin, :password, :password_confirmation, :hashed_password - validates_presence_of :login, :firstname, :lastname, :mail - validates_uniqueness_of :login, :mail - - # Login must contain lettres, numbers, underscores only - validates_format_of :login, :with => /^[a-z0-9_]+$/i - validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i + validates_presence_of :login, :firstname, :lastname, :mail + validates_uniqueness_of :login, :mail + # Login must contain lettres, numbers, underscores only + validates_format_of :login, :with => /^[a-z0-9_]+$/i + validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i + # Password length between 4 and 12 + validates_length_of :password, :in => 4..12, :allow_nil => true + validates_confirmation_of :password, :allow_nil => true + + def before_save + # update hashed_password if password was set + self.hashed_password = User.hash_password(self.password) if self.password + end - def before_create - self.hashed_password = User.hash_password(self.password) - end + # Returns the user that matches provided login and password, or nil + def self.try_to_login(login, password) + user = find(:first, :conditions => ["login=? and hashed_password=? and locked=?", login, User.hash_password(password), false]) + if user + user.last_before_login_on = user.last_login_on + user.update_attribute(:last_login_on, Time.now) + end + user + end - def after_create - @password = nil - end + # Return user's full name for display + def display_name + firstname + " " + lastname + end - # Returns the user that matches user's login and password - def try_to_login - @user = User.login(self.login, self.password) - unless @user.nil? - @user.last_before_login_on = @user.last_login_on - @user.update_attribute(:last_login_on, DateTime.now) - end - @user - end - - # Return user's full name for display - def display_name - firstname + " " + lastname #+ (self.admin ? " (Admin)" : "" ) - end + def check_password?(clear_password) + User.hash_password(clear_password) == self.hashed_password + end - # Returns the user that matches the given login and password - def self.login(login, password) - hashed_password = hash_password(password || "") - find(:first, - :conditions => ["login = ? and hashed_password = ? and locked = ?", login, hashed_password, false]) - end - - def check_password?(clear_password) - User.hash_password(clear_password) == self.hashed_password - end - - def change_password(current_password, new_password) - self.hashed_password = User.hash_password(new_password) - save - end def role_for_project(project_id) @role_for_projects ||= @@ -82,8 +70,8 @@ class User < ActiveRecord::Base end private - # Return password digest - def self.hash_password(clear_password) - Digest::SHA1.hexdigest(clear_password) - end + # Return password digest + def self.hash_password(clear_password) + Digest::SHA1.hexdigest(clear_password || "") + end end diff --git a/redmine/app/models/version.rb b/redmine/app/models/version.rb index 02dee15..70bd6e1 100644 --- a/redmine/app/models/version.rb +++ b/redmine/app/models/version.rb @@ -16,12 +16,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class Version < ActiveRecord::Base - before_destroy :check_integrity - belongs_to :project - has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id' + before_destroy :check_integrity + belongs_to :project + has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id' has_many :attachments, :as => :container, :dependent => true - - validates_presence_of :name, :descr + + validates_presence_of :name + validates_uniqueness_of :name, :scope => [:project_id] private def check_integrity diff --git a/redmine/app/models/workflow.rb b/redmine/app/models/workflow.rb index 212e333..22c873f 100644 --- a/redmine/app/models/workflow.rb +++ b/redmine/app/models/workflow.rb @@ -16,10 +16,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class Workflow < ActiveRecord::Base + belongs_to :role + belongs_to :old_status, :class_name => 'IssueStatus', :foreign_key => 'old_status_id' + belongs_to :new_status, :class_name => 'IssueStatus', :foreign_key => 'new_status_id' - belongs_to :role - belongs_to :old_status, :class_name => 'IssueStatus', :foreign_key => 'old_status_id' - belongs_to :new_status, :class_name => 'IssueStatus', :foreign_key => 'new_status_id' - - validates_presence_of :role, :old_status, :new_status + validates_presence_of :role, :old_status, :new_status end diff --git a/redmine/app/views/account/login.rhtml b/redmine/app/views/account/login.rhtml index cc360eb..bc2b5a5 100644 --- a/redmine/app/views/account/login.rhtml +++ b/redmine/app/views/account/login.rhtml @@ -1,12 +1,12 @@
-

<%=_ 'Please login' %>

+

<%=_('Please login') %>

<%= start_form_tag :action=> "login" %> -


-

+


+<%= text_field_tag 'login', nil, :size => 25 %>


-

+<%= password_field_tag 'password', nil, :size => 25 %>

<%= end_form_tag %> diff --git a/redmine/app/views/account/my_account.rhtml b/redmine/app/views/account/my_account.rhtml index 34ae488..7248f0e 100644 --- a/redmine/app/views/account/my_account.rhtml +++ b/redmine/app/views/account/my_account.rhtml @@ -3,13 +3,14 @@

<%=_('Login')%>: <%= @user.login %>
<%=_('Created on')%>: <%= format_time(@user.created_on) %>, <%=_('Last update')%>: <%= format_time(@user.updated_on) %>

+ +<%= error_messages_for 'user' %>

<%=_('Information')%>

  <%= start_form_tag :action => 'my_account' %> - <%= error_messages_for 'user' %>


@@ -39,14 +40,14 @@   <%= start_form_tag :action => 'change_password' %> -


- <%= password_field_tag 'old_password' %>

+


+ <%= password_field_tag 'password', nil, :size => 25 %>


- <%= password_field_tag 'new_password' %>

+ <%= password_field_tag 'new_password', nil, :size => 25 %>


- <%= password_field_tag 'new_password_confirmation' %>

+ <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %>

<%= submit_tag _('Save') %>
<%= end_form_tag %> diff --git a/redmine/app/views/admin/info.rhtml b/redmine/app/views/admin/info.rhtml index c73f59c..c987805 100644 --- a/redmine/app/views/admin/info.rhtml +++ b/redmine/app/views/admin/info.rhtml @@ -1,4 +1,10 @@

<%=_('Information')%>

-<%=_('Version')%>: <%= RDM_APP_NAME %> <%= RDM_APP_VERSION %>
-<%=_('Database')%>: <%= @adapter_name %> \ No newline at end of file +

<%=_('Version')%>: <%= RDM_APP_NAME %> <%= RDM_APP_VERSION %>

+ +Environment: +
    +<% Rails::Info.properties.each do |name, value| %> +
  • <%= name %>: <%= value %>
  • +<% end %> +
\ No newline at end of file diff --git a/redmine/app/views/admin/projects.rhtml b/redmine/app/views/admin/projects.rhtml index dd39535..bcb940b 100644 --- a/redmine/app/views/admin/projects.rhtml +++ b/redmine/app/views/admin/projects.rhtml @@ -2,20 +2,20 @@ - <%= sort_header_tag('projects.name', :caption => _('Project')) %> + <%= sort_header_tag('name', :caption => _('Project')) %> - - <%= sort_header_tag('projects.created_on', :caption => _('Created on')) %> + + + <%= sort_header_tag('created_on', :caption => _('Created on')) %> -<% odd_or_even = 1 - for project in @projects - odd_or_even = 1 - odd_or_even %> - +<% for project in @projects %> + ">
<%=_('Description')%><%=_('Public')%><%=_('Public')%><%=_('Subprojects')%>
<%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %> <%= project.descr %> - <%= image_tag 'true' if project.public? %> + <%= image_tag 'true' if project.is_public? %> + <%= project.projects_count %> <%= format_date(project.created_on) %> <%= start_form_tag({:controller => 'projects', :action => 'destroy', :id => project}) %> @@ -26,10 +26,7 @@ <% end %>
-<%= link_to ('« ' + _('Previous')), { :page => @project_pages.current.previous } if @project_pages.current.previous %> -<%= pagination_links(@project_pages) %> -<%= link_to (_('Next') + ' »'), { :page => @project_pages.current.next } if @project_pages.current.next %> - -
- -<%= link_to ('» ' + _('New project')), :controller => 'projects', :action => 'add' %> \ No newline at end of file +

<%= pagination_links_full @project_pages %> +[ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]

+ +

<%= link_to ('» ' + _('New project')), :controller => 'projects', :action => 'add' %>

\ No newline at end of file diff --git a/redmine/app/views/custom_fields/list.rhtml b/redmine/app/views/custom_fields/list.rhtml index 0e29a5b..2e65407 100644 --- a/redmine/app/views/custom_fields/list.rhtml +++ b/redmine/app/views/custom_fields/list.rhtml @@ -10,7 +10,7 @@ <% for custom_field in @custom_fields %> - + "> <%= link_to custom_field.name, :action => 'edit', :id => custom_field %> <%= CustomField::TYPES[custom_field.typ][0] %> <%= image_tag 'true' if custom_field.is_required? %> diff --git a/redmine/app/views/documents/show.rhtml b/redmine/app/views/documents/show.rhtml index bc9557e..8e09bb2 100644 --- a/redmine/app/views/documents/show.rhtml +++ b/redmine/app/views/documents/show.rhtml @@ -24,14 +24,16 @@ <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %> <%= format_date(attachment.created_on) %> <%= attachment.author.display_name %> - <%= human_size(attachment.size) %>
<%= attachment.downloads %> <%=_('download')%>(s) + <%= human_size(attachment.filesize) %>
<%= attachment.downloads %> <%=_('download')%>(s) + <% if authorize_for('documents', 'destroy_attachment') %> <%= start_form_tag :action => 'destroy_attachment', :id => @document, :attachment_id => attachment %> <%= submit_tag _('Delete'), :class => "button-small" %> <%= end_form_tag %> - <% end %> + <% end %> + <% end %>
diff --git a/redmine/app/views/issue_statuses/_form.rhtml b/redmine/app/views/issue_statuses/_form.rhtml index 5f4b9ce..7c4d636 100644 --- a/redmine/app/views/issue_statuses/_form.rhtml +++ b/redmine/app/views/issue_statuses/_form.rhtml @@ -1,7 +1,7 @@ <%= error_messages_for 'issue_status' %> -


+

*
<%= text_field 'issue_status', 'name' %>

<%= check_box 'issue_status', 'is_closed' %> @@ -11,7 +11,7 @@

-#<%= text_field 'issue_status', 'html_color', :size => 6 %>

+#<%= text_field 'issue_status', 'html_color', :maxlength => 6 %> *

diff --git a/redmine/app/views/issue_statuses/list.rhtml b/redmine/app/views/issue_statuses/list.rhtml index 050e08f..8c05322 100644 --- a/redmine/app/views/issue_statuses/list.rhtml +++ b/redmine/app/views/issue_statuses/list.rhtml @@ -10,10 +10,10 @@ <% for status in @issue_statuses %> - + "> <%= link_to status.name, :action => 'edit', :id => status %> - <%= image_tag 'true' if status.is_default %> - <%= image_tag 'true' if status.is_closed %> + <%= image_tag 'true' if status.is_default? %> + <%= image_tag 'true' if status.is_closed? %>   <%= start_form_tag :action => 'destroy', :id => status %> diff --git a/redmine/app/views/issues/show.rhtml b/redmine/app/views/issues/show.rhtml index 1c20c92..58c9b35 100644 --- a/redmine/app/views/issues/show.rhtml +++ b/redmine/app/views/issues/show.rhtml @@ -10,7 +10,7 @@

<%=_('Assigned to')%>: <%= @issue.assigned_to.display_name unless @issue.assigned_to.nil? %>

<%=_('Subject')%>: <%= @issue.subject %>

-

<%=_('Description')%>: <%= @issue.descr %>

+

<%=_('Description')%>: <%= simple_format auto_link @issue.descr %>

<%=_('Created on')%>: <%= format_date(@issue.created_on) %>

<% if authorize_for('issues', 'edit') %> @@ -65,7 +65,7 @@ <% for attachment in @issue.attachments %> - + <% if authorize_for('issues', 'destroy_attachment') %> diff --git a/redmine/app/views/layouts/base.rhtml b/redmine/app/views/layouts/base.rhtml index 731632f..21bb036 100644 --- a/redmine/app/views/layouts/base.rhtml +++ b/redmine/app/views/layouts/base.rhtml @@ -81,7 +81,7 @@ diff --git a/redmine/app/views/news/show.rhtml b/redmine/app/views/news/show.rhtml index 30aa2cd..d6773cd 100644 --- a/redmine/app/views/news/show.rhtml +++ b/redmine/app/views/news/show.rhtml @@ -6,5 +6,5 @@ <%=_('Date')%>: <%= format_time(@news.created_on) %>

-<%= @news.descr %> +<%= simple_format auto_link @news.descr %> diff --git a/redmine/app/views/projects/_form.rhtml b/redmine/app/views/projects/_form.rhtml index 2d38117..89f5835 100644 --- a/redmine/app/views/projects/_form.rhtml +++ b/redmine/app/views/projects/_form.rhtml @@ -4,15 +4,23 @@


<%= text_field 'project', 'name' %>

+<% if session[:user].admin %> +


+

+<% end %> +


-<%= text_field 'project', 'descr', :size => 60 %>

+<%= text_area 'project', 'descr', :cols => 60, :rows => 3 %>


<%= text_field 'project', 'homepage', :size => 40 %>

-

<%= check_box 'project', 'public' %> -

- +

<%= check_box 'project', 'is_public' %> +

+
<%=_('Custom fields')%> <% for custom_field in @custom_fields %> <% fixed_issues.each do |version, issues| %> -

<%= version.name %> - <%= format_date(version.date) %>
+

<%= version.name %> - <%= format_date(version.effective_date) %>
<%=h version.descr %>

    <% issues.each do |i| %> diff --git a/redmine/app/views/projects/list.rhtml b/redmine/app/views/projects/list.rhtml index 2b2ac2d..bee507a 100644 --- a/redmine/app/views/projects/list.rhtml +++ b/redmine/app/views/projects/list.rhtml @@ -2,15 +2,13 @@
<%= link_to attachment.filename, :action => 'download', :id => @issue, :attachment_id => attachment %> (<%= human_size(attachment.size) %>)<%= link_to attachment.filename, :action => 'download', :id => @issue, :attachment_id => attachment %> (<%= human_size(attachment.filesize) %>) <%= format_date(attachment.created_on) %> <%= attachment.author.display_name %>
- <%= sort_header_tag('projects.name', :caption => _('Project')) %> + <%= sort_header_tag('name', :caption => _('Project')) %> - <%= sort_header_tag('projects.created_on', :caption => _('Created on')) %> + <%= sort_header_tag('created_on', :caption => _('Created on')) %> -<% odd_or_even = 1 - for project in @projects - odd_or_even = 1 - odd_or_even %> - +<% for project in @projects %> + "> - <% odd_or_even = 1 - for file in version.attachments - odd_or_even = 1 - odd_or_even %> - + <% for file in version.attachments %> + "> - + <% if delete_allowed %> @@ -35,7 +33,8 @@ <% end %> - <% end %> + <% end + reset_cycle %> <% end %>
Description
<%= link_to project.name, :action => 'show', :id => project %> <%= project.descr %> <%= format_date(project.created_on) %> diff --git a/redmine/app/views/projects/list_files.rhtml b/redmine/app/views/projects/list_files.rhtml index 217e679..ced6400 100644 --- a/redmine/app/views/projects/list_files.rhtml +++ b/redmine/app/views/projects/list_files.rhtml @@ -17,14 +17,12 @@
<%= image_tag 'package' %> <%= version.name %>
<%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %> <%= format_date(file.created_on) %><%= human_size(file.size) %><%= human_size(file.filesize) %> <%= file.downloads %> <%= file.digest %>
diff --git a/redmine/app/views/projects/list_issues.rhtml b/redmine/app/views/projects/list_issues.rhtml index c01358e..7e32fb2 100644 --- a/redmine/app/views/projects/list_issues.rhtml +++ b/redmine/app/views/projects/list_issues.rhtml @@ -3,17 +3,19 @@
- - - - - + + + + + + + diff --git a/redmine/app/views/projects/show.rhtml b/redmine/app/views/projects/show.rhtml index 3f10654..4fdbe51 100644 --- a/redmine/app/views/projects/show.rhtml +++ b/redmine/app/views/projects/show.rhtml @@ -13,8 +13,8 @@ <% for tracker in Tracker.find_all %>
  • <%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1, - "issues.tracker_id" => tracker.id %>: - <%= tracker.issues.count(["project_id=?", @project.id]) %> <%=_('open')%> + "tracker_id" => tracker.id %>: + <%= Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %> <%=_('open')%>
  • <% end %> @@ -32,9 +32,18 @@ <% end %> + <% if @subprojects %> +
    +

    <%= image_tag "projects" %> <%=_('Subprojects')%>

    + <% for subproject in @subprojects %> + <%= link_to subproject.name, :action => 'show', :id => subproject %>
    + <% end %> +
    + <% end %> +

    <%=_('Latest news')%>

    - <% for news in @project.news %> + <% for news in @news %>

    <%= news.title %> (<%= link_to_user news.author %> <%= format_time(news.created_on) %>)
    <%= news.shortdescr %> diff --git a/redmine/app/views/roles/list.rhtml b/redmine/app/views/roles/list.rhtml index 146e458..eb1a9ec 100644 --- a/redmine/app/views/roles/list.rhtml +++ b/redmine/app/views/roles/list.rhtml @@ -7,7 +7,7 @@ <% for role in @roles %> -

    + "> <% for tracker in @trackers %> - + ">
    <%=_('Status')%>:
    <%= search_filter_tag("status_id") %>
    <%=_('Tracker')%>:
    <%= search_filter_tag("tracker_id") %>
    <%=_('Priority')%>:
    <%= search_filter_tag("priority_id") %>
    <%=_('Category')%>:
    <%= search_filter_tag("category_id") %>
    <%=_('Assigned to')%>:
    <%= search_filter_tag("assigned_to_id") %>
    <%=_('Status')%>:
    <%= search_filter_tag 'status_id', :class => 'select-small' %>
    <%=_('Tracker')%>:
    <%= search_filter_tag 'tracker_id', :class => 'select-small' %>
    <%=_('Priority')%>:
    <%= search_filter_tag 'priority_id', :class => 'select-small' %>
    <%=_('Category')%>:
    <%= search_filter_tag 'category_id', :class => 'select-small' %>
    <%=_('Assigned to')%>:
    <%= search_filter_tag 'assigned_to_id', :class => 'select-small' %>
    <%=_('Subprojects')%>:
    <%= search_filter_tag 'subproject_id', :class => 'select-small' %>
    - <%= submit_tag _('Apply filter') %> + <%= submit_tag _('Apply filter'), :class => 'button-small' %> <%= end_form_tag %> <%= start_form_tag %> - <%= submit_tag _('Reset') %> + <%= submit_tag _('Reset'), :class => 'button-small' %> <%= end_form_tag %>
    <%= link_to role.name, :action => 'edit', :id => role %> <%= start_form_tag :action => 'destroy', :id => role %> diff --git a/redmine/app/views/trackers/list.rhtml b/redmine/app/views/trackers/list.rhtml index 3622a40..8b03a14 100644 --- a/redmine/app/views/trackers/list.rhtml +++ b/redmine/app/views/trackers/list.rhtml @@ -7,7 +7,7 @@
    <%= link_to tracker.name, :action => 'edit', :id => tracker %> <%= start_form_tag :action => 'destroy', :id => tracker %> diff --git a/redmine/app/views/users/_form.rhtml b/redmine/app/views/users/_form.rhtml index 92f1e0e..6574cb0 100644 --- a/redmine/app/views/users/_form.rhtml +++ b/redmine/app/views/users/_form.rhtml @@ -2,10 +2,13 @@


    -<%= text_field 'user', 'login' %>

    +<%= text_field 'user', 'login', :size => 25 %>

    -


    -<%= password_field 'user', 'password' %>

    +


    +<%= password_field_tag 'password', nil, :size => 25 %>

    + +


    +<%= password_field_tag 'password_confirmation', nil, :size => 25 %>


    <%= text_field 'user', 'firstname' %>

    diff --git a/redmine/app/views/users/list.rhtml b/redmine/app/views/users/list.rhtml index b1bf937..3e3c216 100644 --- a/redmine/app/views/users/list.rhtml +++ b/redmine/app/views/users/list.rhtml @@ -2,18 +2,18 @@ - <%= sort_header_tag('users.login', :caption => _('Login')) %> - <%= sort_header_tag('users.firstname', :caption => _('Firstname')) %> - <%= sort_header_tag('users.lastname', :caption => _('Lastname')) %> + <%= sort_header_tag('login', :caption => _('Login')) %> + <%= sort_header_tag('firstname', :caption => _('Firstname')) %> + <%= sort_header_tag('lastname', :caption => _('Lastname')) %> - <%= sort_header_tag('users.admin', :caption => _('Admin')) %> - <%= sort_header_tag('users.locked', :caption => _('Locked')) %> - <%= sort_header_tag('users.created_on', :caption => _('Created on')) %> - <%= sort_header_tag('users.last_login_on', :caption => _('Last login')) %> + <%= sort_header_tag('admin', :caption => _('Admin')) %> + <%= sort_header_tag('locked', :caption => _('Locked')) %> + <%= sort_header_tag('created_on', :caption => _('Created on')) %> + <%= sort_header_tag('last_login_on', :caption => _('Last login')) %> <% for user in @users %> - + "> @@ -25,10 +25,10 @@
    <%=_('Mail')%>
    <%= link_to user.login, :action => 'edit', :id => user %> <%= user.firstname %> <%= user.lastname %> <%= start_form_tag :action => 'edit', :id => user %> <% if user.locked? %> - <%= hidden_field_tag 'user[locked]', false %> + <%= hidden_field_tag 'user[locked]', 0 %> <%= submit_tag _('Unlock'), :class => "button-small" %> <% else %> - <%= hidden_field_tag 'user[locked]', true %> + <%= hidden_field_tag 'user[locked]', 1 %> <%= submit_tag _('Lock'), :class => "button-small" %> <% end %> <%= end_form_tag %> diff --git a/redmine/app/views/versions/_form.rhtml b/redmine/app/views/versions/_form.rhtml index 189e106..71c761e 100644 --- a/redmine/app/views/versions/_form.rhtml +++ b/redmine/app/views/versions/_form.rhtml @@ -1,13 +1,13 @@ <%= error_messages_for 'version' %> -


    +

    *
    <%= text_field 'version', 'name', :size => 20 %>


    <%= text_field 'version', 'descr', :size => 60 %>

    -


    -<%= date_select 'version', 'date' %>

    +


    +<%= date_select 'version', 'effective_date' %>

    diff --git a/redmine/app/views/welcome/index.rhtml b/redmine/app/views/welcome/index.rhtml index cbffa82..89a18f1 100644 --- a/redmine/app/views/welcome/index.rhtml +++ b/redmine/app/views/welcome/index.rhtml @@ -2,7 +2,7 @@

    <%=_('Welcome')%> !

    -

    Latest news

    +

    <%=_('Latest news')%>

    <% for news in @news %>

    <%= news.title %> (<%= link_to_user news.author %> <%= format_time(news.created_on) %> - <%= news.project.name %>)
    @@ -16,7 +16,7 @@

    -

    Latest projects

    +

    <%=_('Latest projects')%>

      <% for project in @projects %>
    • diff --git a/redmine/config/database.yml b/redmine/config/database.yml index f65dc8c..cfb6f13 100644 --- a/redmine/config/database.yml +++ b/redmine/config/database.yml @@ -5,6 +5,14 @@ # (on OS X: gem install mysql -- --include=/usr/local/lib) # And be sure to use new-style password hashing: # http://dev.mysql.com/doc/refman/5.0/en/old-client.html + +production: + adapter: mysql + database: redmine + host: localhost + username: root + password: + development: adapter: mysql database: redmine_development @@ -18,6 +26,17 @@ development_pgsql: host: localhost username: postgres password: "postgres" + +development_oracle: + adapter: oci + host: 192.168.0.14 + username: rails + password: "rails" + +development_sqlserver: + adapter: sqlserver + host: localhost,1157 + database: redmine test: adapter: mysql @@ -25,15 +44,26 @@ test: host: localhost username: root password: - + +test_pgsql: + adapter: postgresql + database: redmine + host: localhost + username: postgres + password: "postgres" + +test_oracle: + adapter: oci + host: 192.168.0.14 + username: rails_test + password: "rails" + +test_sqlserver: + adapter: sqlserver + host: localhost,1157 + database: redmine_test + demo: adapter: sqlite3 dbfile: db/redmine_demo.db -production: - adapter: mysql - database: redmine - host: localhost - username: root - password: - \ No newline at end of file diff --git a/redmine/config/environment.rb b/redmine/config/environment.rb index de12e7c..acba82e 100644 --- a/redmine/config/environment.rb +++ b/redmine/config/environment.rb @@ -73,7 +73,7 @@ end # application name RDM_APP_NAME = "redMine" # application version -RDM_APP_VERSION = "0.1.0" +RDM_APP_VERSION = "0.2.0" # application host name RDM_HOST_NAME = "somenet.foo" # file storage path diff --git a/redmine/config/environments/development_oracle.rb b/redmine/config/environments/development_oracle.rb new file mode 100644 index 0000000..04b7792 --- /dev/null +++ b/redmine/config/environments/development_oracle.rb @@ -0,0 +1,19 @@ +# Settings specified here will take precedence over those in config/environment.rb + +# In the development environment your application's code is reloaded on +# every request. This slows down response time but is perfect for development +# since you don't have to restart the webserver when you make code changes. +config.cache_classes = false + +# Log error messages when you accidentally call methods on nil. +config.whiny_nils = true + +# Enable the breakpoint server that script/breakpointer connects to +config.breakpoint_server = true + +# Show full error reports and disable caching +config.action_controller.consider_all_requests_local = true +config.action_controller.perform_caching = false + +# Don't care if the mailer can't send +config.action_mailer.raise_delivery_errors = false diff --git a/redmine/config/environments/development_sqlserver.rb b/redmine/config/environments/development_sqlserver.rb new file mode 100644 index 0000000..04b7792 --- /dev/null +++ b/redmine/config/environments/development_sqlserver.rb @@ -0,0 +1,19 @@ +# Settings specified here will take precedence over those in config/environment.rb + +# In the development environment your application's code is reloaded on +# every request. This slows down response time but is perfect for development +# since you don't have to restart the webserver when you make code changes. +config.cache_classes = false + +# Log error messages when you accidentally call methods on nil. +config.whiny_nils = true + +# Enable the breakpoint server that script/breakpointer connects to +config.breakpoint_server = true + +# Show full error reports and disable caching +config.action_controller.consider_all_requests_local = true +config.action_controller.perform_caching = false + +# Don't care if the mailer can't send +config.action_mailer.raise_delivery_errors = false diff --git a/redmine/config/environments/test_oracle.rb b/redmine/config/environments/test_oracle.rb new file mode 100644 index 0000000..0b34ef1 --- /dev/null +++ b/redmine/config/environments/test_oracle.rb @@ -0,0 +1,15 @@ +# Settings specified here will take precedence over those in config/environment.rb + +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! +config.cache_classes = true + +# Log error messages when you accidentally call methods on nil. +config.whiny_nils = true + +# Show full error reports and disable caching +config.action_controller.consider_all_requests_local = true +config.action_controller.perform_caching = false + diff --git a/redmine/config/environments/test_pgsql.rb b/redmine/config/environments/test_pgsql.rb new file mode 100644 index 0000000..0b34ef1 --- /dev/null +++ b/redmine/config/environments/test_pgsql.rb @@ -0,0 +1,15 @@ +# Settings specified here will take precedence over those in config/environment.rb + +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! +config.cache_classes = true + +# Log error messages when you accidentally call methods on nil. +config.whiny_nils = true + +# Show full error reports and disable caching +config.action_controller.consider_all_requests_local = true +config.action_controller.perform_caching = false + diff --git a/redmine/config/environments/test_sqlserver.rb b/redmine/config/environments/test_sqlserver.rb new file mode 100644 index 0000000..0b34ef1 --- /dev/null +++ b/redmine/config/environments/test_sqlserver.rb @@ -0,0 +1,15 @@ +# Settings specified here will take precedence over those in config/environment.rb + +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! +config.cache_classes = true + +# Log error messages when you accidentally call methods on nil. +config.whiny_nils = true + +# Show full error reports and disable caching +config.action_controller.consider_all_requests_local = true +config.action_controller.perform_caching = false + diff --git a/redmine/config/help.yml b/redmine/config/help.yml index a48798e..362165b 100644 --- a/redmine/config/help.yml +++ b/redmine/config/help.yml @@ -1,21 +1,62 @@ -# administration -admin: - index: administration.html - mail_options: administration.html#mail_notifications - info: administration.html#app_info -users: - index: administration.html#users -roles: - index: administration.html#roles - workflow: administration.html#workflow -trackers: - index: administration.html#trackers -issue_statuses: - index: administration.html#issue_statuses +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# projects -projects: - add: projects.html#settings +# available languages for help pages +langs: + - fr - -# issues \ No newline at end of file +# mapping between controller/action and help pages +# if action is not defined here, 'index' page will be displayed +pages: + # administration + admin: + index: ch01.html + mail_options: ch01s08.html + info: ch01s09.html + users: + index: ch01s01.html + roles: + index: ch01s02.html + workflow: ch01s06.html + trackers: + index: ch01s03.html + issue_statuses: + index: ch01s05.html + # projects + projects: + index: ch02.html + add: ch02s08.html + show: ch02s01.html + add_document: ch02s06.html + list_documents: ch02s06.html + add_issue: ch02s02.html + list_issues: ch02s02.html + add_news: ch02s05.html + list_news: ch02s05.html + add_file: ch02s07.html + list_files: ch02s07.html + changelog: ch02s04.html + issues: + index: ch02s02.html + documents: + index: ch02s06.html + news: + index: ch02s05.html + versions: + index: ch02s08.html + reports: + index: ch02s03.html \ No newline at end of file diff --git a/redmine/db/migrate/001_setup.rb b/redmine/db/migrate/001_setup.rb index c075c89..17487fc 100644 --- a/redmine/db/migrate/001_setup.rb +++ b/redmine/db/migrate/001_setup.rb @@ -1,3 +1,20 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + class Setup < ActiveRecord::Migration def self.up create_table "attachments", :force => true do |t| @@ -5,8 +22,8 @@ class Setup < ActiveRecord::Migration t.column "container_type", :string, :limit => 30, :default => "", :null => false t.column "filename", :string, :default => "", :null => false t.column "disk_filename", :string, :default => "", :null => false - t.column "size", :integer, :default => 0, :null => false - t.column "content_type", :string, :limit => 60, :default => "", :null => false + t.column "filesize", :integer, :default => 0, :null => false + t.column "content_type", :string, :limit => 60, :default => "" t.column "digest", :string, :limit => 40, :default => "", :null => false t.column "downloads", :integer, :default => 0, :null => false t.column "author_id", :integer, :default => 0, :null => false @@ -18,8 +35,8 @@ class Setup < ActiveRecord::Migration t.column "typ", :integer, :default => 0, :null => false t.column "is_required", :boolean, :default => false, :null => false t.column "is_for_all", :boolean, :default => false, :null => false - t.column "possible_values", :text, :default => "", :null => false - t.column "regexp", :string, :default => "", :null => false + t.column "possible_values", :text, :default => "" + t.column "regexp", :string, :default => "" t.column "min_length", :integer, :default => 0, :null => false t.column "max_length", :integer, :default => 0, :null => false end @@ -59,7 +76,7 @@ class Setup < ActiveRecord::Migration t.column "issue_id", :integer, :default => 0, :null => false t.column "status_id", :integer, :default => 0, :null => false t.column "author_id", :integer, :default => 0, :null => false - t.column "notes", :text, :default => "", :null => false + t.column "notes", :text, :default => "" t.column "created_on", :timestamp end @@ -99,7 +116,7 @@ class Setup < ActiveRecord::Migration create_table "news", :force => true do |t| t.column "project_id", :integer t.column "title", :string, :limit => 60, :default => "", :null => false - t.column "shortdescr", :string, :default => "", :null => false + t.column "shortdescr", :string, :default => "" t.column "descr", :text, :default => "", :null => false t.column "author_id", :integer, :default => 0, :null => false t.column "created_on", :timestamp @@ -109,7 +126,7 @@ class Setup < ActiveRecord::Migration t.column "controller", :string, :limit => 30, :default => "", :null => false t.column "action", :string, :limit => 30, :default => "", :null => false t.column "descr", :string, :limit => 60, :default => "", :null => false - t.column "public", :boolean, :default => false, :null => false + t.column "is_public", :boolean, :default => false, :null => false t.column "sort", :integer, :default => 0, :null => false t.column "mail_option", :boolean, :default => false, :null => false t.column "mail_enabled", :boolean, :default => false, :null => false @@ -125,8 +142,10 @@ class Setup < ActiveRecord::Migration create_table "projects", :force => true do |t| t.column "name", :string, :limit => 30, :default => "", :null => false t.column "descr", :string, :default => "", :null => false - t.column "homepage", :string, :limit => 60, :default => "", :null => false - t.column "public", :boolean, :default => true, :null => false + t.column "homepage", :string, :limit => 60, :default => "" + t.column "is_public", :boolean, :default => true, :null => false + t.column "parent_id", :integer + t.column "projects_count", :integer, :default => 0 t.column "created_on", :timestamp t.column "updated_on", :timestamp end @@ -158,8 +177,8 @@ class Setup < ActiveRecord::Migration create_table "versions", :force => true do |t| t.column "project_id", :integer, :default => 0, :null => false t.column "name", :string, :limit => 30, :default => "", :null => false - t.column "descr", :string, :default => "", :null => false - t.column "date", :date, :null => false + t.column "descr", :string, :default => "" + t.column "effective_date", :date, :null => false t.column "created_on", :timestamp t.column "updated_on", :timestamp end @@ -172,13 +191,13 @@ class Setup < ActiveRecord::Migration end # project - Permission.create :controller => "projects", :action => "show", :descr => "Overview", :sort => 100, :public => true - Permission.create :controller => "projects", :action => "changelog", :descr => "View change log", :sort => 105, :public => true - Permission.create :controller => "reports", :action => "issue_report", :descr => "View reports", :sort => 110, :public => true + Permission.create :controller => "projects", :action => "show", :descr => "Overview", :sort => 100, :is_public => true + Permission.create :controller => "projects", :action => "changelog", :descr => "View change log", :sort => 105, :is_public => true + Permission.create :controller => "reports", :action => "issue_report", :descr => "View reports", :sort => 110, :is_public => true Permission.create :controller => "projects", :action => "settings", :descr => "Settings", :sort => 150 Permission.create :controller => "projects", :action => "edit", :descr => "Edit", :sort => 151 # members - Permission.create :controller => "projects", :action => "list_members", :descr => "View list", :sort => 200, :public => true + Permission.create :controller => "projects", :action => "list_members", :descr => "View list", :sort => 200, :is_public => true Permission.create :controller => "projects", :action => "add_member", :descr => "New member", :sort => 220 Permission.create :controller => "members", :action => "edit", :descr => "Edit", :sort => 221 Permission.create :controller => "members", :action => "destroy", :descr => "Delete", :sort => 222 @@ -191,9 +210,9 @@ class Setup < ActiveRecord::Migration Permission.create :controller => "issue_categories", :action => "edit", :descr => "Edit", :sort => 421 Permission.create :controller => "issue_categories", :action => "destroy", :descr => "Delete", :sort => 422 # issues - Permission.create :controller => "projects", :action => "list_issues", :descr => "View list", :sort => 1000, :public => true - Permission.create :controller => "issues", :action => "show", :descr => "View", :sort => 1005, :public => true - Permission.create :controller => "issues", :action => "download", :descr => "Download file", :sort => 1010, :public => true + Permission.create :controller => "projects", :action => "list_issues", :descr => "View list", :sort => 1000, :is_public => true + Permission.create :controller => "issues", :action => "show", :descr => "View", :sort => 1005, :is_public => true + Permission.create :controller => "issues", :action => "download", :descr => "Download file", :sort => 1010, :is_public => true Permission.create :controller => "projects", :action => "add_issue", :descr => "Report an issue", :sort => 1050, :mail_option => 1, :mail_enabled => 1 Permission.create :controller => "issues", :action => "edit", :descr => "Edit", :sort => 1055 Permission.create :controller => "issues", :action => "change_status", :descr => "Change status", :sort => 1060, :mail_option => 1, :mail_enabled => 1 @@ -201,28 +220,30 @@ class Setup < ActiveRecord::Migration Permission.create :controller => "issues", :action => "add_attachment", :descr => "Add file", :sort => 1070 Permission.create :controller => "issues", :action => "destroy_attachment", :descr => "Delete file", :sort => 1075 # news - Permission.create :controller => "projects", :action => "list_news", :descr => "View list", :sort => 1100, :public => true - Permission.create :controller => "news", :action => "show", :descr => "View", :sort => 1101, :public => true + Permission.create :controller => "projects", :action => "list_news", :descr => "View list", :sort => 1100, :is_public => true + Permission.create :controller => "news", :action => "show", :descr => "View", :sort => 1101, :is_public => true Permission.create :controller => "projects", :action => "add_news", :descr => "Add", :sort => 1120 Permission.create :controller => "news", :action => "edit", :descr => "Edit", :sort => 1121 Permission.create :controller => "news", :action => "destroy", :descr => "Delete", :sort => 1122 # documents - Permission.create :controller => "projects", :action => "list_documents", :descr => "View list", :sort => 1200, :public => true - Permission.create :controller => "documents", :action => "show", :descr => "View", :sort => 1201, :public => true - Permission.create :controller => "documents", :action => "download", :descr => "Download", :sort => 1202, :public => true + Permission.create :controller => "projects", :action => "list_documents", :descr => "View list", :sort => 1200, :is_public => true + Permission.create :controller => "documents", :action => "show", :descr => "View", :sort => 1201, :is_public => true + Permission.create :controller => "documents", :action => "download", :descr => "Download", :sort => 1202, :is_public => true Permission.create :controller => "projects", :action => "add_document", :descr => "Add", :sort => 1220 Permission.create :controller => "documents", :action => "edit", :descr => "Edit", :sort => 1221 Permission.create :controller => "documents", :action => "destroy", :descr => "Delete", :sort => 1222 Permission.create :controller => "documents", :action => "add_attachment", :descr => "Add file", :sort => 1223 Permission.create :controller => "documents", :action => "destroy_attachment", :descr => "Delete file", :sort => 1224 # files - Permission.create :controller => "projects", :action => "list_files", :descr => "View list", :sort => 1300, :public => true - Permission.create :controller => "versions", :action => "download", :descr => "Download", :sort => 1301, :public => true + Permission.create :controller => "projects", :action => "list_files", :descr => "View list", :sort => 1300, :is_public => true + Permission.create :controller => "versions", :action => "download", :descr => "Download", :sort => 1301, :is_public => true Permission.create :controller => "projects", :action => "add_file", :descr => "Add", :sort => 1320 Permission.create :controller => "versions", :action => "destroy_file", :descr => "Delete", :sort => 1322 # create default administrator account - user = User.create :login => "admin", :password => "admin", :firstname => "redMine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en" + user = User.create :firstname => "redMine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en" + user.login = "admin" + user.password = "admin" user.admin = true user.save diff --git a/redmine/db/migrate/002_default_configuration.rb b/redmine/db/migrate/002_default_configuration.rb index 8f851df..794a96b 100644 --- a/redmine/db/migrate/002_default_configuration.rb +++ b/redmine/db/migrate/002_default_configuration.rb @@ -1,12 +1,29 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + class DefaultConfiguration < ActiveRecord::Migration def self.up # roles r = Role.create(:name => "Manager") r.permissions = Permission.find(:all) r = Role.create :name => "Developer" - r.permissions = Permission.find([1, 2, 3, 6, 10, 11, 12, 16, 17, 18, 19, 20, 21, 23, 25, 26, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41]) + r.permissions = Permission.find(:all) r = Role.create :name => "Reporter" - r.permissions = Permission.find([1, 2, 3, 6, 16, 17, 18, 19, 20, 21, 23, 25, 26, 30, 31, 32, 38, 39]) + r.permissions = Permission.find(:all) # trackers Tracker.create(:name => "Bug", :is_in_chlog => true) Tracker.create(:name => "Feature request", :is_in_chlog => true) diff --git a/redmine/doc/CHANGELOG b/redmine/doc/CHANGELOG index bae2e1b..a696412 100644 --- a/redmine/doc/CHANGELOG +++ b/redmine/doc/CHANGELOG @@ -2,13 +2,22 @@ redMine - project management software Copyright (C) 2006 Jean-Philippe Lang -http://redmine.sourceforge.net/ +http://redmine.org/ -== xx/xx/2006 +== 07/09/2006 - v0.2.0 -* More filter options in issues list -* Issues list exportable to CSV +* new databases supported: Oracle, PostgreSQL, SQL Server +* projects/subprojects hierarchy (1 level of subprojects only) +* environment information display in admin/info +* more filter options in issues list (rev6) +* default language based on browser settings (Accept-Language HTTP header) +* issues list exportable to CSV (rev6) +* simple_format and auto_link on long text fields +* more data validations +* Fixed: error when all mail notifications are unchecked in admin/mail_options +* Fixed: all project news are displayed on project summary +* Fixed: Can't change user password in users/edit * Fixed: Error on tables creation with PostgreSQL (rev5) * Fixed: SQL error in "issue reports" view with PostgreSQL (rev5) diff --git a/redmine/doc/INSTALL b/redmine/doc/INSTALL index 72a9936..e263a66 100644 --- a/redmine/doc/INSTALL +++ b/redmine/doc/INSTALL @@ -2,15 +2,23 @@ redMine - project management software Copyright (C) 2006 Jean-Philippe Lang -http://redmine.sourceforge.net/ +http://redmine.org/ == Requirements * Ruby on Rails 1.1 -* Any database supported by Rails (developped using MySQL 5) +* a database (see compatibility below) * (recommended) Apache/Lighttpd with FCGI support +Supported databases: + +* MySQL (tested with MySQL 5) +* PostgreSQL (tested with PostgreSQL 8.1) +* Oracle (tested with Oracle 10g) +* SQL Server (tested with SQL Server 2005) +* SQLite (tested with SQLite 3) + == Installation @@ -20,9 +28,9 @@ http://redmine.sourceforge.net/ 2. Create an empty database: "redmine" for example 3. Configure database parameters in config/database.yml - for "production" environment + for "production" environment (default database is MySQL) -4. Create database structure. Under application main directory: +4. Create the database structure. Under application main directory: rake migrate RAILS_ENV="production" It will create tables and default configuration data diff --git a/redmine/doc/README b/redmine/doc/README index 1c794e4..874ac76 100644 --- a/redmine/doc/README +++ b/redmine/doc/README @@ -2,7 +2,7 @@ redMine - project management software Copyright (C) 2006 Jean-Philippe Lang -http://redmine.sourceforge.net/ +http://redmine.org/ == License @@ -34,6 +34,12 @@ redMine is a project management software written using Ruby on Rails. * multilanguage support +== User documentation + +User documentation for redMine is written using DocBook XML format. +It's also avaible as HTML files in /public/manual (contextual help) + + == Versioning redMine versioning scheme is major.minor.revision diff --git a/redmine/lang/fr_FR.rb b/redmine/lang/fr_FR.rb index 5dc7a59..0a7ce01 100644 --- a/redmine/lang/fr_FR.rb +++ b/redmine/lang/fr_FR.rb @@ -10,7 +10,11 @@ Localization.define('fr', 'Français') do |l| l.store 'Resolved', 'Résolue' l.store 'Closed', 'Fermée' l.store 'Rejected', 'Rejetée' - l.store 'Feedback', 'Commentaire' + l.store 'Feedback', 'Commentaire' + # filters + l.store '[All]', '[Tous]' + l.store '[Open]', '[Ouvert]' + l.store '[None]', '[Aucun]' # issue priorities l.store 'Issue priorities', 'Priorités des demandes' @@ -53,6 +57,9 @@ Localization.define('fr', 'Français') do |l| l.store 'Reported issues', 'Demandes soumises' l.store 'Assigned to me', 'Demandes qui me sont assignées' + # ./script/../config/../app/views/account/login.rhtml + l.store 'Please login', 'Identification' + # ./script/../config/../app/views/account/show.rhtml l.store 'Registered on', 'Inscrit le' l.store 'Projects', 'Projets' @@ -231,6 +238,7 @@ Localization.define('fr', 'Français') do |l| l.store 'New file', 'Nouveau fichier' # ./script/../config/../app/views/projects/list_issues.rhtml + l.store 'Subprojects', 'Sous-projets' l.store 'Apply filter', 'Appliquer' l.store 'Reset', 'Annuler' l.store 'Report an issue', 'Nouvelle demande' @@ -311,6 +319,6 @@ Localization.define('fr', 'Français') do |l| # ./script/../config/../app/views/versions/_form.rhtml # ./script/../config/../app/views/welcome/index.rhtml - + l.store 'Latest projects', 'Derniers projets' end diff --git a/redmine/public/manual/administration.html b/redmine/public/manual/administration.html deleted file mode 100644 index 22016c4..0000000 --- a/redmine/public/manual/administration.html +++ /dev/null @@ -1,121 +0,0 @@ - - - -redMine - Aide en ligne - - - - - - - -

      [ Index ]

      -

      Administration

      -Sommaire: -
        -
      1. Utilisateurs
      2. -
      3. R�les et permissions
      4. -
      5. Trackers
      6. -
      7. Champs personnalis�s
      8. -
      9. Statuts de demande
      10. -
      11. Workflow
      12. -
      13. Listes de valeurs
      14. -
      15. Notifications par mail
      16. -
      17. Informations
      18. -
      - - -

      1. Utilisateurs

      -

      Ces �crans vous permettent de g�rer les utilisateurs de l'application.

      -

      1.1 Liste des utilisateurs

      -

      -Liste des utilisateurs
      -

      1.2 Cr�ation ou modification d'un utilisateur

      -
        -
      • Administrateur: d�clare l'utilisateur comme administrateur de l'application.
      • -
      • Notifications par mail: permet d'activer ou non l'envoi automatique de notifications par mail pour cet utilisateur
      • -
      • Verrouill�: d�sactive le compte de l'utilisateur
      • -
      -

      En mode modification, laissez le champ Password vide pour laisser le mot de passe de l'utilisateur inchang�.

      -

      Un utilisateur d�clar� comme administrateur dispose de toutes les permissions sur l'application et sur tous les projets.

      - - -

      2. R�les et permissions

      -

      Les r�les permettent de d�finir les permissions des diff�rents membres d'un projet.
      -Chaque membre d'un projet dispose d'un r�le unique au sein d'un projet. -Un utilisateur peut avoir diff�rents r�les au sein de diff�rents projets.

      -

      Sur l'�cran d'�dition du r�le, cochez les actions que vous souhaitez autoriser pour le r�le.

      - - -

      3. Trackers

      -

      Les trackers permettent de typer les demandes et de d�finir des workflows sp�cifiques pour chacun de ces types.

      - -

      4. Champs personnalis�s

      -

      Les champs personnalis�s vous permettent d'ajouter des informations suppl�mentaires sur les demandes.

      -Un champ personnalis� peut �tre de l'un des types suivants: -
        -
      • Integer: entier positif ou n�gatif
      • -
      • String: cha�ne de caract�re
      • -
      • Date: date
      • -
      • Boolean: bool�en (case � cocher)
      • -
      • List: valeur � s�lectionn�e parmi une liste pr�d�finie (liste d�roulante)
      • -
      -Des �l�ments de validation peuvent �tre d�finis: -
        -
      • Required: champ dont la saisie est obligatoire sur les demandes
      • -
      • For all projects: champ automatiquement associ� � l'ensemble des projets
      • -
      • Min - max length: longueurs minimales et maximales pour les champs en saisie libre (0 signifie qu'il n'y a pas de restriction)
      • -
      • Regular expression: expression r�guli�re permettant de valider la valeur saisie
      • -
      • Possible values (only for lists): valeurs possibles pour les champs de type "List". Les valeurs sont s�par�es par le caract�re |
      • -
      -

      Si l'option For all projects n'est pas activ�e, chaque projet pourra ou non utilis� le champ personnalis� pour ses demandes -(voir Project settings).

      - - -

      5. Statuts des demandes

      -

      Cet �cran vous permet de d�finir les diff�rents statuts possibles des demandes.

      -
        -
      • Closed: indique que le statut correspond � une demande consid�r�e comme ferm�e
      • -
      • Default: statut appliqu� par d�faut aux nouvelles demandes (seul un statut peut �tre d�clar� comme statut par d�faut)
      • -
      • HTML color: code de couleur HTML repr�sentant le statut � l'affichage
      • -
      - - -

      6. Workflow

      -

      Le workflow permet de d�finir quels changements les diff�rents membres d'un projet sont autoris�s � effectuer sur le statut des demandes, en fonction de leur type.

      -

      S�lectionnez le r�le et le type de demande pour lesquels vous souhaitez modifier le workflow, puis cliquez sur Edit. -L'�cran vous permet alors de modifier, pour le r�le et le type de demande choisi, les changements autoris�s.

      -

      Les lignes repr�sentent les statuts initiaux des demandes. Les colonnes repr�sentent les statuts autoris�s � �tre appliqu�s.

      -

      Dans l'exemple ci-dessous, les demandes de type Bug au statut New pourront �tre pass�es au statut Assigned ou Resolved par le r�le D�veloppeur.
      -Celles au statut Assigned pourront �tre pass�es au statut Resolved.
      -Le statut de toutes les autres demandes de type Bug ne pourra pas �tre modifi� par le D�veloppeur.

      -

      -Exemple de configuration d'un workflow
      -

      Remarque: pour qu'un r�le puisse changer le statut des demandes, la permission "Changer le statut des demandes" doit lui �tre explicitement donn�e ind�pendemment de la configuration du workflow (voir Roles et permissions). - - -

      7. Listes de valeurs

      -

      Les listes de valeurs utilis�es par l'application (exemple: les priorit�s des demandes) peuvent �tre personnalis�es en fonction de vos besoins.
      -Cet �cran vous permet de d�finir les valeurs possibles pour chacune des listes suivantes:

      -
        -
      • Priorit�s des demandes
      • -
      • Cat�gories de documents
      • -
      - - -

      8. Notifications par mail

      -

      Cet �cran vous permet de s�lectionner les actions qui donneront lieu � une notification par mail aux membres du projet.

      -

      Remarque: l'envoi de mails doit �tre activ� dans la configuration de l'application si souhaitez effectuer des notifications.

      - - -

      9. Informations

      -

      Affiche des informations relatives � l'application

      -
        -
      • Version: version de l'application
      • -
      • Database: type de base de donn�es utilis�e
      • -
      - - - - - diff --git a/redmine/public/manual/fr/ch01.html b/redmine/public/manual/fr/ch01.html new file mode 100644 index 0000000..b5f1129 --- /dev/null +++ b/redmine/public/manual/fr/ch01.html @@ -0,0 +1,3 @@ + + + Chapter 1. Administration \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s01.html b/redmine/public/manual/fr/ch01s01.html new file mode 100644 index 0000000..f2ac52c --- /dev/null +++ b/redmine/public/manual/fr/ch01s01.html @@ -0,0 +1,3 @@ + + + 1. Utilisateurs

      1. Utilisateurs

      Ces écrans vous permettent de gérer les utilisateurs de l'application.

      1.1. Liste des utilisateurs

      Les boutons Lock/Unlock vous permettent de vérouiller/dévérouiller les comptes utilisateurs.

      Un utilisateur dont le compte est vérouillé ne peut plus s'identifier pour accéder à l'application.

      1.2. Création ou modification d'un utilisateur

      En mode modification, laissez le champ Password vide pour laisser le mot de passe de l'utilisateur inchangé.

      Un utilisateur déclaré comme administrateur dispose de toutes les permissions sur l'application et sur tous les projets.

      • Administrateur: déclare l'utilisateur comme administrateur de l'application.

      • Notifications par mail: permet d'activer ou non l'envoi automatique de notifications par mail pour cet utilisateur

      • Vérouillé: désactive le compte de l'utilisateur

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s02.html b/redmine/public/manual/fr/ch01s02.html new file mode 100644 index 0000000..c0251d9 --- /dev/null +++ b/redmine/public/manual/fr/ch01s02.html @@ -0,0 +1,3 @@ + + + 2. Rôles et permissions

      2. Rôles et permissions

      Les rôles permettent de définir les permissions des différents membres d'un projet. Chaque membre d'un projet dispose d'un rôle unique au sein d'un projet. Un utilisateur peut avoir différents rôles au sein de différents projets.

      Sur l'écran d'édition du rôle, cochez les actions que vous souhaitez autoriser pour le rôle.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s03.html b/redmine/public/manual/fr/ch01s03.html new file mode 100644 index 0000000..07ce84f --- /dev/null +++ b/redmine/public/manual/fr/ch01s03.html @@ -0,0 +1,3 @@ + + + 3. Trackers

      3. Trackers

      Les trackers permettent de typer les demandes et de définir des workflows spécifiques pour chacun de ces types.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s04.html b/redmine/public/manual/fr/ch01s04.html new file mode 100644 index 0000000..3882317 --- /dev/null +++ b/redmine/public/manual/fr/ch01s04.html @@ -0,0 +1,3 @@ + + + 4. Champs personnalisés

      4. Champs personnalisés

      Les champs personnalisés vous permettent d'ajouter des informations supplémentaires sur les demandes. Un champ personnalisé peut être de l'un des types suivants:

      • Integer: entier positif ou négatif

      • String: chaîne de caractère

      • Date: date

      • Boolean: booléen (case à cocher)

      • List: valeur à sélectionnée parmi une liste prédéfinie (liste déroulante)

      Des éléments de validation peuvent être définis:

      • Obligatoire: champ dont la saisie est obligatoire sur les demandes

      • Pour tous les projects: champ automatiquement associé à l'ensemble des projets

      • Min - max length: longueurs minimales et maximales pour les champs en saisie libre (0 signifie qu'il n'y a pas de restriction)

      • Expression régulière: expression régulière permettant de valider la valeur saisie

      • Valeurs possibles: valeurs possibles pour les champs de type "Liste". Les valeurs sont séparées par le caractère |

      Si l'option Pour tous les projets n'est pas activée, chaque projet pourra choisir d'utiliser ou non le champ pour ses demandes.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s05.html b/redmine/public/manual/fr/ch01s05.html new file mode 100644 index 0000000..46ede48 --- /dev/null +++ b/redmine/public/manual/fr/ch01s05.html @@ -0,0 +1,3 @@ + + + 5. Statut des demandes

      5. Statut des demandes

      Ces écrans vous permettent de définir les différents statuts possibles des demandes.

      • Demande fermée: indique que le statut correspond à une demande considérée comme fermée

      • Statut par défaut: statut appliqué par défaut aux nouvelles demandes (seul un statut peut être déclaré comme statut par défaut)

      • Couleur: code couleur HTML (6 caractères) représentant le statut à l'affichage

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s06.html b/redmine/public/manual/fr/ch01s06.html new file mode 100644 index 0000000..daf622c --- /dev/null +++ b/redmine/public/manual/fr/ch01s06.html @@ -0,0 +1,3 @@ + + + 6. Workflow

      6. Workflow

      Le workflow permet de définir les changements que les différents membres d'un projet sont autorisés à effectuer sur les demandes, en fonction de leur type.

      Sélectionnez le rôle et le tracker pour lesquels vous souhaitez modifier le workflow, puis cliquez sur Edit. L'écran vous permet alors de modifier, pour le rôle et le tracker choisi, les changements autorisés. Les lignes représentent les statuts initiaux des demandes. Les colonnes représentent les statuts autorisés à être appliqués.

      Remarque: pour qu'un rôle puisse changer le statut des demandes, la permission doit lui être explicitement donnée indépendemment de la configuration du workflow.

      Dans l'exemple ci-dessus, les demandes de type Bug au statut Nouveau pourront être passées au statut Assignée ou Résolue par le rôle Développeur. Celles au statut Assignée pourront être passées au statut Résolue. Le statut de toutes les autres demandes de type Bug ne pourra pas être modifié par le Développeur.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s07.html b/redmine/public/manual/fr/ch01s07.html new file mode 100644 index 0000000..d6763da --- /dev/null +++ b/redmine/public/manual/fr/ch01s07.html @@ -0,0 +1,3 @@ + + + 7. Listes de valeurs

      7. Listes de valeurs

      Les listes de valeurs utilisées par l'application (exemple: les priorités des demandes) peuvent être personnalisées. Cet écran vous permet de définir les valeurs possibles pour chacune des listes suivantes:

      • Priorités des demandes

      • Catégories de documents

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s08.html b/redmine/public/manual/fr/ch01s08.html new file mode 100644 index 0000000..7b44c92 --- /dev/null +++ b/redmine/public/manual/fr/ch01s08.html @@ -0,0 +1,3 @@ + + + 8. Notifications par mail

      8. Notifications par mail

      Cet écran vous permet de sélectionner les actions qui donneront lieu à une notification par mail aux membres du projet.

      Remarque: l'envoi de mails doit être activé dans la configuration de l'application si souhaitez effectuer des notifications.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch01s09.html b/redmine/public/manual/fr/ch01s09.html new file mode 100644 index 0000000..7093b94 --- /dev/null +++ b/redmine/public/manual/fr/ch01s09.html @@ -0,0 +1,3 @@ + + + 9. Informations

      9. Informations

      Affiche des informations relatives à l'application et à son environnement.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02.html b/redmine/public/manual/fr/ch02.html new file mode 100644 index 0000000..06e1456 --- /dev/null +++ b/redmine/public/manual/fr/ch02.html @@ -0,0 +1,3 @@ + + + Chapter 2. Projets \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s01.html b/redmine/public/manual/fr/ch02s01.html new file mode 100644 index 0000000..0893ab8 --- /dev/null +++ b/redmine/public/manual/fr/ch02s01.html @@ -0,0 +1,3 @@ + + + 1. Aperçu du projet

      1. Aperçu du projet

      L'aperçu vous présente les informations générales relatives au projet, les principaux membres, les dernières annonces, ainsi qu'une synthèse du nombre de demandes ouvertes par tracker.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s02.html b/redmine/public/manual/fr/ch02s02.html new file mode 100644 index 0000000..a016c41 --- /dev/null +++ b/redmine/public/manual/fr/ch02s02.html @@ -0,0 +1,3 @@ + + + 2. Gestion des demandes

      2. Gestion des demandes

      2.1. Liste des demandes

      Par défaut, l'ensemble des demandes ouvertes du projet sont affichées. Différents filtres vous permettent de sélectionner les demandes à afficher. Si le projet comporte des sous-projets, vous avez la possibilité d'afficher également les demandes relatives aux sous-projets (non affichées par défaut).

      Une fois appliqué, un filtre reste valable durant toute votre session. Vous pouvez le redéfinir, ou le supprimer en cliquant sur Annuler.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s03.html b/redmine/public/manual/fr/ch02s03.html new file mode 100644 index 0000000..cd97fb8 --- /dev/null +++ b/redmine/public/manual/fr/ch02s03.html @@ -0,0 +1,3 @@ + + + 3. Rapports

      3. Rapports

      Cet écran présente la synthèse du nombre de demandes par statut et selon différents critères (tracker, priorité, catégorie). Des liens directs permettent d'accéder à la liste détaillée des demandes pour chaque critère.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s04.html b/redmine/public/manual/fr/ch02s04.html new file mode 100644 index 0000000..6d20bbb --- /dev/null +++ b/redmine/public/manual/fr/ch02s04.html @@ -0,0 +1,3 @@ + + + 4. Historique

      4. Historique

      Cette page présente l'ensemble des demandes résolues dans chacune des versions du projet. Certains types de demande peuvent être exclus de cet affichage.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s05.html b/redmine/public/manual/fr/ch02s05.html new file mode 100644 index 0000000..4fb95b4 --- /dev/null +++ b/redmine/public/manual/fr/ch02s05.html @@ -0,0 +1,3 @@ + + + 5. Annonces

      5. Annonces

      Les nouvelles vous permettent d'informer les utilisateurs sur l'activité du projet.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s06.html b/redmine/public/manual/fr/ch02s06.html new file mode 100644 index 0000000..98c03c7 --- /dev/null +++ b/redmine/public/manual/fr/ch02s06.html @@ -0,0 +1,3 @@ + + + 6. Documents

      6. Documents

      Les documents sont groupés par catégories (voir Listes de valeurs). Un document peut contenir plusieurs fichiers (exemple: révisions ou versions successives).

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s07.html b/redmine/public/manual/fr/ch02s07.html new file mode 100644 index 0000000..221e833 --- /dev/null +++ b/redmine/public/manual/fr/ch02s07.html @@ -0,0 +1,3 @@ + + + 7. Fichiers

      7. Fichiers

      Ce module vous permet de publier les différents fichiers (sources, binaires, ...) pour chaque version de l'application.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/ch02s08.html b/redmine/public/manual/fr/ch02s08.html new file mode 100644 index 0000000..37657dc --- /dev/null +++ b/redmine/public/manual/fr/ch02s08.html @@ -0,0 +1,3 @@ + + + 8. Configuration du projet

      8. Configuration du projet

      8.1. Propriétés du projet

      • Public: si le projet est public, il sera visible (consultation des demandes, des documents, ...) pour l'ensemble des utilisateurs, y compris ceux qui ne sont pas membres du projet. Si le projet n'est pas public, seuls les membres du projet y ont accès, en fonction de leur rôle.

      • Champs personnalisés: sélectionner les champs personnalisés que vous souhaitez utiliser au sein du projet. Seul l'administrateur peut ajouter de nouveaux champs personnalisés.

      8.2. Membres

      Cet écran vous permet de définir les membres du projet ainsi que leurs rôles respectifs. Un utilisateur ne peut avoir qu'un rôle au sein d'un projet donné. Le rôle d'un membre détermine les permissions dont il bénéficie sur le projet.

      8.3. Versions

      Les versions vous permettent de suivre les changements survenus tout au long du projet. A la fermeture d'une demande, vous pouvez par exemple indiquer quelle version la prend en compte. Vous pouvez par ailleurs publier les différentes versions de l'application (voir Fichiers).

      8.4. Catégories des demandes

      Les catégories de demande vous permettent de typer les demandes. Les catégories peuvent par exemple correspondre aux différents modules du projet.

      \ No newline at end of file diff --git a/redmine/public/manual/fr/html.css b/redmine/public/manual/fr/html.css new file mode 100644 index 0000000..c1b2a6f --- /dev/null +++ b/redmine/public/manual/fr/html.css @@ -0,0 +1,55 @@ +body { + background: #FFFFFF; + font: 0.8em Verdana,Tahoma,Arial,sans-serif; +} + +h1, h2, h3, h4, h5 { + color: #800000; + font-family: sans-serif; +} + +table { + font-size: 1em; +} + +a{ +color:#467aa7; +font-weight:bold; +text-decoration:none; +background-color:inherit; +} + +a:hover{ + color: #800000; + text-decoration:underline; + background-color:inherit; +} + +a img{border:none;} + +.screenshot { + text-align: center; +} + +.guilabel { + font-weight: bold; +} + +span.term { + font-weight: bold; +} + +div.sidebar { + background: #F0F0F0; + border: 1px solid gray; + padding: 5px; + margin: 20px; +} + +pre.programlisting { + background: #F0F0F0; + border: 1px solid gray; + padding: 2px; + font-size: 10pt; + white-space: pre; +} diff --git a/redmine/public/manual/fr/index.html b/redmine/public/manual/fr/index.html new file mode 100644 index 0000000..1f485fe --- /dev/null +++ b/redmine/public/manual/fr/index.html @@ -0,0 +1,3 @@ + + + Documentation redMine \ No newline at end of file diff --git a/redmine/public/manual/fr/resources/issues_list.png b/redmine/public/manual/fr/resources/issues_list.png new file mode 100644 index 0000000000000000000000000000000000000000..47eab0fca46c570c533b8851aa0323e70e90b6e9 GIT binary patch literal 8233 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 R$^DtRs-ouea(RpQ{{w%&p_>2z literal 0 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 H%j5q5u-!hK literal 0 Hc$@ewiu;78<&`1dG4vj;w1`;d~96}=r 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 P2LmX|smWGKo4x-x&ov{- diff --git a/redmine/public/manual/images/users_edit.png b/redmine/public/manual/images/users_edit.png deleted file mode 100644 index 3a4797e9d30d697a2710f82eaf31cdbb543478a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@sK)+gfbq$^5zvzBR-(WMi`}!6#g<007`$ zH=0z-=jc_5a}&YT))WAsrGZyHfs#1`*5;-T*Se=a+ouj|!9VSs0S-j_>} z0q0>xx-WtI1y}0y&z_;?@qy!2?~++iGSqZ~J(;S_jf?|txJPnD7OWWEOq9~61n0VU zD$i!XBbRu9Xkw)4W631Q3JDo4SPQ)B9n8iPMKtJixNa4J$yTvmaJ^<4i)CG6ezV6>z@#DIcLCqiBc z;*Cs%LF0dh&YP+yrVA%$`|X_$DkZP&sX_ANXlg-HXnRj#L_~Ek>TIS_(Tv*pEHTWv zNudrcmwx~^@KAOiG(VobvLjcg!=d*2*kgxnx|z~f)&!;>2ktLc`*MM;s}|rS8_VoE z;QqiM=3jL9yl1v$=b||zEo;&Z?R?{NghqL&IN|vLAc?rFsMTP%Iu0t4{&6VBF4|6N z`SF|7DGcgI4*x5X)yZAEkWK%;gr9(R)={YZ_x`CqO~;XbpSH(GS$nBHH=ps<;~vQ6 zp&U-;=ALxk-f=TbQNzBYRF1+If3P-Oeoy3@JOW$Mf2-OvIEJHN%`j@BzmoCdV%f?# zm#*~sGQ#LyGAr-yOA)m|!)7sx&@uWn*@Z$RgeIxAKatli-BLe4uHfjh)DgnCJ7?%c zo*M@>kdYe{F;lZorz1`}_%bd-|CPiwx|=R`cHbGJu{UVqjdPQ;QtlOFaamet6Vd`& z3YXnRvGCuKimDb2AxL8k_&zG$@D4p{qUC8}clER1dtRhH%8X|)E9+YQPFz!k?L&SO zP@eI5bMQP?6^Dr35tCAED1SIP$G>p5;qHsDl3MMZbioJSoX+-!f%;y6yndTtlUg>z z(;Tgbc0ZREVq40e+FMFaUfP<|tz!-;wA`d@=@>?y+hW)N zBP(x=ehwirmR*@|ybH zDb1rKSmJ4Jq_Uv5Xx@hT^2ycJZUdpWX!+o`R@<~@z-Gyy?@*^Yw>Wk^F?S4u%YWDB z1E?t#>S@0i3z1YBSJ!kyXQE;8swLZhSMhVE5w4w+PiQZNCXJ*#uKiX`I_`mM1yfy9 z57qHO4Z3N_wSCN~7z~p=jUWjGMRM4K<}uJZRC@;9EGPIfFz;;E1oO}IQ;U3yL~h(^d|@812PVSG^&;3t&j zOVvytP1y$(4VRQn_+``S7ta~3?3+=zIM=X3@9&)`9^?JV3;cjF91KvNJzM|?$x*e|cPK1i9d!hc) zYEsvUgRy?=U)Dr5#>Q*jQDr1o!`f(-5NsD{WM0om=W0BEjYDj5(ABa@bg|Gn597t_ zv1$t^3n#Z(?-7X@Wf9GBb?QdBmoRMsZLNV=-+S8pukSmQEJT!?fSjxXw>HdS(ab?H z9BsYuHIalT=pf~Dqf-O`OG*UD@9+r%k5zKHp8ea51ToIc~+H6nddxm{yv ze$leIVp7_CbTreprES4Bt#vg;yen+4tZQ76b5ZJgLesgZXuX7(W%lwhA!*@HG$|(r z1Lrsl%bGYA$it=e@Z#;(>kqlWrNh(fgI{K6eM)+7^lohqS+LSBtF>BP^d|k$gP!9v>B74wf25_U#ar_3I8PCej4P11Rj-1 z)VCEBR1#Brh}fdI9v{Ewiz|0WiFz-|+4^%S`lJ)35${r0ZChmtJnRSE-~>+rKn&7c%8jfuSeoWwwX1%sB0>?*$BlDe@DZf64j;dEcx=w}Y%Wu_$H`L^El zh3lbNio<^$EuU_kn&#}UfVv&6;62Rj5GIz80(mb@y^{Q_2%ziR8v+TuKQU(_?R;9d zFx6}NwJUf%#&28E6&Yf9Sk8`DZ*qGZiU+FLUmfVO?!rAec{(;9d}lN|rs|b5-g;B; xx3_&P2I~9qVqr%EO_Q@Kkxfbx3o@HBc5^mRofN2%C7(ZlwS}E|iJ3?2{{U^{&*%UE diff --git a/redmine/public/manual/images/workflow.png b/redmine/public/manual/images/workflow.png deleted file mode 100644 index 26071cadea608cf0bc95ca302d293c911e14a267..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@4=CRy@gN{6%YXhM2a9qnt%ZUNG}N; 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 TBZtZWtY)ZhrdO?V@9Dn)AZhQ@ diff --git a/redmine/public/manual/index.html b/redmine/public/manual/index.html deleted file mode 100644 index 3f0cb1e..0000000 --- a/redmine/public/manual/index.html +++ /dev/null @@ -1,64 +0,0 @@ - - - -redMine - Aide en ligne - - - - - - - -

      Aide

      - -

      Documentation en ligne redMine

      - -Sommaire: - - - - \ No newline at end of file diff --git a/redmine/public/manual/projects.html b/redmine/public/manual/projects.html deleted file mode 100644 index 13922f6..0000000 --- a/redmine/public/manual/projects.html +++ /dev/null @@ -1,109 +0,0 @@ - - - -redMine - Aide en ligne - - - - - - - -

      [ Index ]

      -

      Projets

      -Sommaire: -
        -
      1. Aper�u
      2. -
      3. Demandes -
          -
        • Liste des demandes
        • -
        • Nouvelle demande
        • -
        • Changer le statut d'une demande
        • -
        -
      4. -
      5. Rapports
      6. -
      7. Annonces
      8. -
      9. Historique
      10. -
      11. Documents
      12. -
      13. Membres
      14. -
      15. Fichiers
      16. -
      17. Configuration
      18. -
          -
        • Projet
        • -
        • Membres
        • -
        • Versions
        • -
        • Cat�gories de demande
        • -
        -
      - - -

      1. Aper�u

      -

      L'aper�u vous pr�sente les informations g�n�rales relatives au projet, les principaux membres, les derni�res annonces, ainsi qu'une synth�se du nombre de demandes ouvertes par tracker. - - -

      2. Demandes

      -

      2.1 Liste des demandes

      -Par d�faut, l'ensemble des demandes sont affich�es. Vous pouvez utiliser les diff�rents filtres pour limiter l'affichage � certaines demandes seulement.
      -Lorsque vous appliquez un filtre, il reste en place durant toute votre session. Vous pouvez le red�finir, ou le supprimer en cliquant sur Annuler. -

      -Liste des demandes
      - -

      2.2 Nouvelle demande

      -

      TODO

      - -

      2.3 Changer le statut d'une demande

      -

      TODO

      - - -

      3. Rapports

      -

      Synth�se du nombre de demandes par statut et selon diff�rents crit�res (tracker, priorit�, cat�gorie). -Des liens directs permettent d'acc�der � la liste d�taill�e des demandes pour chaque crit�re.

      - - -

      4. Annonces

      -

      Les nouvelles vous permettent d'informer les utilisateurs sur l'activit� du projet.

      - - -

      5. Historique

      -

      Cette page pr�sente l'ensemble des demandes r�solues dans chacune des versions du projet. -Certains types de demande peuvent �tre exclus de cet affichage (voir Trackers).

      - - -

      6. Documents

      -

      Les documents sont group�s par cat�gories (voir Listes de valeurs).
      -Un document peut contenir plusieurs fichiers (exemple: r�visions ou versions successives)

      - - -

      7. Membres

      -

      Affichage de l'ensemble des membres du projet, par r�le

      - - -

      8. Fichiers

      -

      Ce module vous permet de publier les fichiers de l'application (sources, binaires, ...) pour chaque version de l'application .

      - -

      9. Configuration

      -

      9.1 Projet

      -
        -
      • Public: si le projet est public, il sera visible (consultation des demandes, des documents, ...) pour l'ensemble des utilisateurs, y compris ceux qui ne sont pas membres du projet.
        - Si le projet n'est pas public, seuls les membres du projet y ont acc�s, en fonction de leur r�le.
      • -
      • Champs personnalis�s: s�lectionner les champs personnalis�s que vous souhaitez utiliser au sein du projet.
        - Seul l'administrateur peut ajouter de nouveaux champs personnalis�s.
      • -
      -

      9.2 Membres

      -

      Cette section vous permet de d�finir les membres du projet ainsi que leurs r�les respectifs.
      -Un utilisateur ne peut avoir qu'un r�le au sein d'un projet donn�. Le r�le d'un membre d�termine les permissions dont il b�n�ficie sur le projet.

      - -

      9.3 Versions

      -

      Les versions vous permettent de suivre les changements survenus tout au long du projet. -A la fermeture d'une demande, vous pouvez indiquer quelle version la prend en compte.
      -Vous pouvez par ailleurs publier les diff�rentes versions de l'application (voir Fichiers). -

      - - -

      9.4 Cat�gories de demande

      -

      Les cat�gories de demande vous permettent de typer les demandes. Les cat�gories peuvent par exemple correspondre aux modules de l'application.

      - - - - - diff --git a/redmine/public/manual/stylesheets/help.css b/redmine/public/manual/stylesheets/help.css deleted file mode 100644 index f67bc72..0000000 --- a/redmine/public/manual/stylesheets/help.css +++ /dev/null @@ -1,70 +0,0 @@ -/* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */ - -/**************** Body and tag styles ****************/ - - - -body{ -font:76% Verdana,Tahoma,Arial,sans-serif; -line-height:1.4em; -color:#303030; -margin: 20px; -} - -a{ -color:#467aa7; -font-weight:bold; -text-decoration:none; -background-color:inherit; -} - -a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;} -a img{border:none;} - -p{padding:0 0 0.2em 0;} -p form{margin-top:0; margin-bottom:20px;} - -h1 { -display:block; - -font-size:1.7em; -font-weight:normal; -letter-spacing:-1px; -color:#505050; -background-color:inherit; -} - -h2 { -display:block; -margin: 30px 0 0 0; -font-size:1.5em; -font-weight:normal; -letter-spacing:-1px; -color:#505050; -background-color:inherit; -} - -hr { border:0px; border-bottom:1px dashed #000000; } - - -/**************** Misc classes and styles ****************/ - -.splitcontentleft{float:left; width:49%;} -.splitcontentright{float:right; width:49%;} -.clear{clear:both;} -.small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;} -.hide{display:none;} -.textcenter{text-align:center;} -.textright{text-align:right;} -.important{color:#f02025; background-color:inherit; } - -.box{ -margin:0 0 20px 0; -padding:10px; -border:1px solid #c0c0c0; -background-color:#fafbfc; -color:#505050; -line-height:1.5em; -} - - diff --git a/redmine/public/stylesheets/application.css b/redmine/public/stylesheets/application.css index ac66105..43f2bac 100644 --- a/redmine/public/stylesheets/application.css +++ b/redmine/public/stylesheets/application.css @@ -189,11 +189,20 @@ input.button-small font-size: 0.8em; } +select.select-small +{ + font-size: 0.8em; +} + label { font-weight: bold; font-size: 1em; } +fieldset { + border:1px solid #7F9DB9; +} + .required { color: #bb0000; } @@ -220,10 +229,10 @@ tr.ListHead a { text-decoration:underline; } -tr.ListLine0 { +tr.odd { background-color: #C1E2F7; } -tr.ListLine1 { +tr.even { background-color:#CEE1ED; } diff --git a/redmine/test/fixtures/attachments.yml b/redmine/test/fixtures/attachments.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/attachments.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/custom_fields.yml b/redmine/test/fixtures/custom_fields.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/custom_fields.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/documents.yml b/redmine/test/fixtures/documents.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/documents.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/enumerations.yml b/redmine/test/fixtures/enumerations.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/enumerations.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/issue_categories.yml b/redmine/test/fixtures/issue_categories.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/issue_categories.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/issue_custom_fields.yml b/redmine/test/fixtures/issue_custom_fields.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/issue_custom_fields.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/issue_custom_values.yml b/redmine/test/fixtures/issue_custom_values.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/issue_custom_values.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/issue_histories.yml b/redmine/test/fixtures/issue_histories.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/issue_histories.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/issue_statuses.yml b/redmine/test/fixtures/issue_statuses.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/issue_statuses.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/issues.yml b/redmine/test/fixtures/issues.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/issues.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/mailer/issue_closed b/redmine/test/fixtures/mailer/issue_closed deleted file mode 100644 index bb5e51d..0000000 --- a/redmine/test/fixtures/mailer/issue_closed +++ /dev/null @@ -1,3 +0,0 @@ -Mailer#issue_closed - -Find me in app/views/mailer/issue_closed.rhtml diff --git a/redmine/test/fixtures/members.yml b/redmine/test/fixtures/members.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/members.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/news.yml b/redmine/test/fixtures/news.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/news.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/permissions.yml b/redmine/test/fixtures/permissions.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/permissions.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/projects.yml b/redmine/test/fixtures/projects.yml index 8794d28..0358c5f 100644 --- a/redmine/test/fixtures/projects.yml +++ b/redmine/test/fixtures/projects.yml @@ -1,5 +1,26 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: +ecookbook: id: 1 -another: + name: eCookbook + descr: Recipes management application + homepage: http://ecookbook.somenet.foo/ + projects_count: 1 + created_on: 2005-01-01 01:00:00 + updated_on: 2005-01-01 01:00:00 +onlinestore: id: 2 + name: OnlineStore + descr: E-commerce web site + is_public: false + projects_count: 0 + created_on: 2005-01-01 01:00:00 + updated_on: 2005-01-01 01:00:00 +tracker: + id: 3 + name: tracker + descr: bug tracker + is_public: true + projects_count: 0 + parent_id: 1 + created_on: 2005-01-01 01:00:00 + updated_on: 2005-01-01 01:00:00 \ No newline at end of file diff --git a/redmine/test/fixtures/roles.yml b/redmine/test/fixtures/roles.yml index 8794d28..ce67630 100644 --- a/redmine/test/fixtures/roles.yml +++ b/redmine/test/fixtures/roles.yml @@ -1,5 +1,10 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: +manager: id: 1 -another: + name: manager +developer: id: 2 + name: developer +reporter: + id: 3 + name: reporter diff --git a/redmine/test/fixtures/trackers.yml b/redmine/test/fixtures/trackers.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/trackers.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/users.yml b/redmine/test/fixtures/users.yml index 8794d28..1d6ca5c 100644 --- a/redmine/test/fixtures/users.yml +++ b/redmine/test/fixtures/users.yml @@ -1,5 +1,19 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: +admin: id: 1 -another: + login: admin + firstname: admin + lastname: admin + mail: admin@somenet.foo + hashed_password: d033e22ae348aeb5660fc2140aec35850c4da997 + admin: true + language: en +paulochon: id: 2 + login: plochon + firstname: Paul + lastname: Ochon + mail: plochon@somenet.foo + hashed_password: d033e22ae348aeb5660fc2140aec35850c4da997 + admin: false + language: en \ No newline at end of file diff --git a/redmine/test/fixtures/versions.yml b/redmine/test/fixtures/versions.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/versions.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/fixtures/workflow.yml b/redmine/test/fixtures/workflow.yml deleted file mode 100644 index 8794d28..0000000 --- a/redmine/test/fixtures/workflow.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -first: - id: 1 -another: - id: 2 diff --git a/redmine/test/functional/account_controller_test.rb b/redmine/test/functional/account_controller_test.rb deleted file mode 100644 index 537eb8f..0000000 --- a/redmine/test/functional/account_controller_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'account_controller' - -# Re-raise errors caught by the controller. -class AccountController; def rescue_action(e) raise e end; end - -class AccountControllerTest < Test::Unit::TestCase - def setup - @controller = AccountController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/functional/admin_controller_test.rb b/redmine/test/functional/admin_controller_test.rb deleted file mode 100644 index e44ac94..0000000 --- a/redmine/test/functional/admin_controller_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'admin_controller' - -# Re-raise errors caught by the controller. -class AdminController; def rescue_action(e) raise e end; end - -class AdminControllerTest < Test::Unit::TestCase - def setup - @controller = AdminController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/functional/custom_fields_controller_test.rb b/redmine/test/functional/custom_fields_controller_test.rb deleted file mode 100644 index f86e325..0000000 --- a/redmine/test/functional/custom_fields_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'custom_fields_controller' - -# Re-raise errors caught by the controller. -class CustomFieldsController; def rescue_action(e) raise e end; end - -class CustomFieldsControllerTest < Test::Unit::TestCase - fixtures :custom_fields - - def setup - @controller = CustomFieldsController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:custom_fields) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:custom_field) - assert assigns(:custom_field).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:custom_field) - end - - def test_create - num_custom_fields = CustomField.count - - post :create, :custom_field => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_custom_fields + 1, CustomField.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:custom_field) - assert assigns(:custom_field).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil CustomField.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - CustomField.find(1) - } - end -end diff --git a/redmine/test/functional/documents_controller_test.rb b/redmine/test/functional/documents_controller_test.rb deleted file mode 100644 index c9bd463..0000000 --- a/redmine/test/functional/documents_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'documents_controller' - -# Re-raise errors caught by the controller. -class DocumentsController; def rescue_action(e) raise e end; end - -class DocumentsControllerTest < Test::Unit::TestCase - fixtures :documents - - def setup - @controller = DocumentsController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:documents) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:document) - assert assigns(:document).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:document) - end - - def test_create - num_documents = Document.count - - post :create, :document => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_documents + 1, Document.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:document) - assert assigns(:document).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Document.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Document.find(1) - } - end -end diff --git a/redmine/test/functional/enumerations_controller_test.rb b/redmine/test/functional/enumerations_controller_test.rb deleted file mode 100644 index e9f4b76..0000000 --- a/redmine/test/functional/enumerations_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'enumerations_controller' - -# Re-raise errors caught by the controller. -class EnumerationsController; def rescue_action(e) raise e end; end - -class EnumerationsControllerTest < Test::Unit::TestCase - fixtures :enumerations - - def setup - @controller = EnumerationsController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:enumerations) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:enumeration) - assert assigns(:enumeration).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:enumeration) - end - - def test_create - num_enumerations = Enumeration.count - - post :create, :enumeration => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_enumerations + 1, Enumeration.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:enumeration) - assert assigns(:enumeration).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Enumeration.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Enumeration.find(1) - } - end -end diff --git a/redmine/test/functional/help_controller_test.rb b/redmine/test/functional/help_controller_test.rb deleted file mode 100644 index 291838b..0000000 --- a/redmine/test/functional/help_controller_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'help_controller' - -# Re-raise errors caught by the controller. -class HelpController; def rescue_action(e) raise e end; end - -class HelpControllerTest < Test::Unit::TestCase - def setup - @controller = HelpController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/functional/issue_categories_controller_test.rb b/redmine/test/functional/issue_categories_controller_test.rb deleted file mode 100644 index 4ea4e1c..0000000 --- a/redmine/test/functional/issue_categories_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'issue_categories_controller' - -# Re-raise errors caught by the controller. -class IssueCategoriesController; def rescue_action(e) raise e end; end - -class IssueCategoriesControllerTest < Test::Unit::TestCase - fixtures :issue_categories - - def setup - @controller = IssueCategoriesController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:issue_categories) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:issue_category) - assert assigns(:issue_category).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:issue_category) - end - - def test_create - num_issue_categories = IssueCategory.count - - post :create, :issue_category => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_issue_categories + 1, IssueCategory.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:issue_category) - assert assigns(:issue_category).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil IssueCategory.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - IssueCategory.find(1) - } - end -end diff --git a/redmine/test/functional/issue_statuses_controller_test.rb b/redmine/test/functional/issue_statuses_controller_test.rb deleted file mode 100644 index 17f11ef..0000000 --- a/redmine/test/functional/issue_statuses_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'issue_statuses_controller' - -# Re-raise errors caught by the controller. -class IssueStatusesController; def rescue_action(e) raise e end; end - -class IssueStatusesControllerTest < Test::Unit::TestCase - fixtures :issue_statuses - - def setup - @controller = IssueStatusesController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:issue_statuses) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:issue_status) - assert assigns(:issue_status).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:issue_status) - end - - def test_create - num_issue_statuses = IssueStatus.count - - post :create, :issue_status => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_issue_statuses + 1, IssueStatus.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:issue_status) - assert assigns(:issue_status).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil IssueStatus.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - IssueStatus.find(1) - } - end -end diff --git a/redmine/test/functional/issues_controller_test.rb b/redmine/test/functional/issues_controller_test.rb deleted file mode 100644 index 1be41f8..0000000 --- a/redmine/test/functional/issues_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'issues_controller' - -# Re-raise errors caught by the controller. -class IssuesController; def rescue_action(e) raise e end; end - -class IssuesControllerTest < Test::Unit::TestCase - fixtures :issues - - def setup - @controller = IssuesController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:issues) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:issue) - assert assigns(:issue).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:issue) - end - - def test_create - num_issues = Issue.count - - post :create, :issue => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_issues + 1, Issue.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:issue) - assert assigns(:issue).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Issue.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Issue.find(1) - } - end -end diff --git a/redmine/test/functional/members_controller_test.rb b/redmine/test/functional/members_controller_test.rb deleted file mode 100644 index 5f47c35..0000000 --- a/redmine/test/functional/members_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'members_controller' - -# Re-raise errors caught by the controller. -class MembersController; def rescue_action(e) raise e end; end - -class MembersControllerTest < Test::Unit::TestCase - fixtures :members - - def setup - @controller = MembersController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:members) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:member) - assert assigns(:member).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:member) - end - - def test_create - num_members = Member.count - - post :create, :member => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_members + 1, Member.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:member) - assert assigns(:member).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Member.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Member.find(1) - } - end -end diff --git a/redmine/test/functional/news_controller_test.rb b/redmine/test/functional/news_controller_test.rb deleted file mode 100644 index b360c6c..0000000 --- a/redmine/test/functional/news_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'news_controller' - -# Re-raise errors caught by the controller. -class NewsController; def rescue_action(e) raise e end; end - -class NewsControllerTest < Test::Unit::TestCase - fixtures :news - - def setup - @controller = NewsController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:news) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:news) - assert assigns(:news).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:news) - end - - def test_create - num_news = News.count - - post :create, :news => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_news + 1, News.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:news) - assert assigns(:news).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil News.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - News.find(1) - } - end -end diff --git a/redmine/test/functional/projects_controller_test.rb b/redmine/test/functional/projects_controller_test.rb index 8da34ec..23776ed 100644 --- a/redmine/test/functional/projects_controller_test.rb +++ b/redmine/test/functional/projects_controller_test.rb @@ -1,3 +1,20 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + require File.dirname(__FILE__) + '/../test_helper' require 'projects_controller' @@ -27,62 +44,4 @@ class ProjectsControllerTest < Test::Unit::TestCase assert_not_nil assigns(:projects) end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:project) - assert assigns(:project).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:project) - end - - def test_create - num_projects = Project.count - - post :create, :project => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_projects + 1, Project.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:project) - assert assigns(:project).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Project.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Project.find(1) - } - end end diff --git a/redmine/test/functional/reports_controller_test.rb b/redmine/test/functional/reports_controller_test.rb deleted file mode 100644 index 4b52ffa..0000000 --- a/redmine/test/functional/reports_controller_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'reports_controller' - -# Re-raise errors caught by the controller. -class ReportsController; def rescue_action(e) raise e end; end - -class ReportsControllerTest < Test::Unit::TestCase - def setup - @controller = ReportsController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/functional/roles_controller_test.rb b/redmine/test/functional/roles_controller_test.rb deleted file mode 100644 index 299aef2..0000000 --- a/redmine/test/functional/roles_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'roles_controller' - -# Re-raise errors caught by the controller. -class RolesController; def rescue_action(e) raise e end; end - -class RolesControllerTest < Test::Unit::TestCase - fixtures :roles - - def setup - @controller = RolesController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:roles) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:role) - assert assigns(:role).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:role) - end - - def test_create - num_roles = Role.count - - post :create, :role => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_roles + 1, Role.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:role) - assert assigns(:role).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Role.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Role.find(1) - } - end -end diff --git a/redmine/test/functional/trackers_controller_test.rb b/redmine/test/functional/trackers_controller_test.rb deleted file mode 100644 index 75063c6..0000000 --- a/redmine/test/functional/trackers_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'trackers_controller' - -# Re-raise errors caught by the controller. -class TrackersController; def rescue_action(e) raise e end; end - -class TrackersControllerTest < Test::Unit::TestCase - fixtures :trackers - - def setup - @controller = TrackersController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:trackers) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:tracker) - assert assigns(:tracker).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:tracker) - end - - def test_create - num_trackers = Tracker.count - - post :create, :tracker => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_trackers + 1, Tracker.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:tracker) - assert assigns(:tracker).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Tracker.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Tracker.find(1) - } - end -end diff --git a/redmine/test/functional/users_controller_test.rb b/redmine/test/functional/users_controller_test.rb deleted file mode 100644 index f1e2281..0000000 --- a/redmine/test/functional/users_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'users_controller' - -# Re-raise errors caught by the controller. -class UsersController; def rescue_action(e) raise e end; end - -class UsersControllerTest < Test::Unit::TestCase - fixtures :users - - def setup - @controller = UsersController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:users) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:user) - assert assigns(:user).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:user) - end - - def test_create - num_users = User.count - - post :create, :user => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_users + 1, User.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:user) - assert assigns(:user).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil User.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - User.find(1) - } - end -end diff --git a/redmine/test/functional/versions_controller_test.rb b/redmine/test/functional/versions_controller_test.rb deleted file mode 100644 index 85b2ef7..0000000 --- a/redmine/test/functional/versions_controller_test.rb +++ /dev/null @@ -1,88 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'versions_controller' - -# Re-raise errors caught by the controller. -class VersionsController; def rescue_action(e) raise e end; end - -class VersionsControllerTest < Test::Unit::TestCase - fixtures :versions - - def setup - @controller = VersionsController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def test_index - get :index - assert_response :success - assert_template 'list' - end - - def test_list - get :list - - assert_response :success - assert_template 'list' - - assert_not_nil assigns(:versions) - end - - def test_show - get :show, :id => 1 - - assert_response :success - assert_template 'show' - - assert_not_nil assigns(:version) - assert assigns(:version).valid? - end - - def test_new - get :new - - assert_response :success - assert_template 'new' - - assert_not_nil assigns(:version) - end - - def test_create - num_versions = Version.count - - post :create, :version => {} - - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_equal num_versions + 1, Version.count - end - - def test_edit - get :edit, :id => 1 - - assert_response :success - assert_template 'edit' - - assert_not_nil assigns(:version) - assert assigns(:version).valid? - end - - def test_update - post :update, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'show', :id => 1 - end - - def test_destroy - assert_not_nil Version.find(1) - - post :destroy, :id => 1 - assert_response :redirect - assert_redirected_to :action => 'list' - - assert_raise(ActiveRecord::RecordNotFound) { - Version.find(1) - } - end -end diff --git a/redmine/test/functional/welcome_controller_test.rb b/redmine/test/functional/welcome_controller_test.rb deleted file mode 100644 index d773945..0000000 --- a/redmine/test/functional/welcome_controller_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'welcome_controller' - -# Re-raise errors caught by the controller. -class WelcomeController; def rescue_action(e) raise e end; end - -class WelcomeControllerTest < Test::Unit::TestCase - def setup - @controller = WelcomeController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/integration/account_test.rb b/redmine/test/integration/account_test.rb new file mode 100644 index 0000000..7652d4a --- /dev/null +++ b/redmine/test/integration/account_test.rb @@ -0,0 +1,76 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require "#{File.dirname(__FILE__)}/../test_helper" + +class AccountTest < ActionController::IntegrationTest + fixtures :users + + # Replace this with your real tests. + def test_login + get "account/my_page" + assert_redirected_to "account/login" + log_user('plochon', 'admin') + + get "account/my_account" + assert_response :success + assert_template "account/my_account" + end + + def test_change_password + log_user('plochon', 'admin') + get "account/my_account" + assert_response :success + assert_template "account/my_account" + + post "account/change_password", :password => 'admin', :new_password => "hello", :new_password_confirmation => "hello2" + assert_response :success + assert_tag :tag => "div", :attributes => { :class => "errorExplanation" } + + post "account/change_password", :password => 'admiN', :new_password => "hello", :new_password_confirmation => "hello" + assert_response :success + assert_equal 'Wrong password', flash[:notice] + + post "account/change_password", :password => 'admin', :new_password => "hello", :new_password_confirmation => "hello" + assert_response :success + log_user('plochon', 'hello') + end + + def test_my_account + log_user('plochon', 'admin') + get "account/my_account" + assert_response :success + assert_template "account/my_account" + + post "account/my_account", :user => {:firstname => "Joe", :login => "root", :admin => 1} + assert_response :success + assert_template "account/my_account" + user = User.find(2) + assert_equal "Joe", user.firstname + assert_equal "plochon", user.login + assert_equal false, user.admin? + + log_user('plochon', 'admin') + end + + def test_my_page + log_user('plochon', 'admin') + get "account/my_page" + assert_response :success + assert_template "account/my_page" + end +end diff --git a/redmine/test/integration/admin_test.rb b/redmine/test/integration/admin_test.rb new file mode 100644 index 0000000..3b01d28 --- /dev/null +++ b/redmine/test/integration/admin_test.rb @@ -0,0 +1,61 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require "#{File.dirname(__FILE__)}/../test_helper" + +class AdminTest < ActionController::IntegrationTest + fixtures :users + + def test_add_user + log_user("admin", "admin") + get "/users/add" + assert_response :success + assert_template "users/add" + post "/users/add", :user => { :login => "jsmith", :firstname => "John", :lastname => "Smith", :mail => "jsmith@somenet.foo", :language => "en" }, :password => "jsmith09", :password_confirmation => "jsmith09" + assert_redirected_to "users/list" + + user = User.find_by_login("jsmith") + assert_kind_of User, user + logged_user = User.try_to_login("jsmith", "jsmith09") + assert_kind_of User, logged_user + assert_equal "John", logged_user.firstname + + post "users/edit", :id => user.id, :user => { :locked => 1 } + assert_redirected_to "users/list" + locked_user = User.try_to_login("jsmith", "jsmith09") + assert_equal nil, locked_user + end + + def test_add_project + log_user("admin", "admin") + get "projects/add" + assert_response :success + assert_template "projects/add" + post "projects/add", :project => { :name => "blog", :descr => "weblog", :is_public => 1} + assert_redirected_to "admin/projects" + assert_equal 'Project was successfully created.', flash[:notice] + + project = Project.find_by_name("blog") + assert_kind_of Project, project + assert_equal "weblog", project.descr + assert_equal true, project.is_public? + + get "admin/projects" + assert_response :success + assert_template "admin/projects" + end +end diff --git a/redmine/test/test_helper.rb b/redmine/test/test_helper.rb index a299c7f..edc7c5c 100644 --- a/redmine/test/test_helper.rb +++ b/redmine/test/test_helper.rb @@ -1,4 +1,21 @@ -ENV["RAILS_ENV"] = "test" +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +ENV["RAILS_ENV"] ||= "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' @@ -25,4 +42,14 @@ class Test::Unit::TestCase self.use_instantiated_fixtures = false # Add more helper methods to be used by all tests here... + + def log_user(login, password) + get "/account/login" + assert_equal nil, session[:user] + assert_response :success + assert_template "account/login" + post "/account/login", :login => login, :password => password + assert_redirected_to "account/my_page" + assert_equal login, session[:user].login + end end diff --git a/redmine/test/unit/attachment_test.rb b/redmine/test/unit/attachment_test.rb deleted file mode 100644 index 6f66833..0000000 --- a/redmine/test/unit/attachment_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class AttachmentTest < Test::Unit::TestCase - fixtures :attachments - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/unit/custom_field_test.rb b/redmine/test/unit/custom_field_test.rb deleted file mode 100644 index 886bd51..0000000 --- a/redmine/test/unit/custom_field_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class CustomFieldTest < Test::Unit::TestCase - fixtures :custom_fields - - # Replace this with your real tests. - def test_truth - assert_kind_of CustomField, custom_fields(:first) - end -end diff --git a/redmine/test/unit/document_test.rb b/redmine/test/unit/document_test.rb deleted file mode 100644 index acd96dd..0000000 --- a/redmine/test/unit/document_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class DocumentTest < Test::Unit::TestCase - fixtures :documents - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/unit/enumeration_test.rb b/redmine/test/unit/enumeration_test.rb deleted file mode 100644 index ea8c014..0000000 --- a/redmine/test/unit/enumeration_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class EnumerationTest < Test::Unit::TestCase - fixtures :enumerations - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/unit/issue_category_test.rb b/redmine/test/unit/issue_category_test.rb deleted file mode 100644 index 6f5051b..0000000 --- a/redmine/test/unit/issue_category_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class IssueCategoryTest < Test::Unit::TestCase - fixtures :issue_categories - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/unit/issue_custom_field_test.rb b/redmine/test/unit/issue_custom_field_test.rb deleted file mode 100644 index 2adee10..0000000 --- a/redmine/test/unit/issue_custom_field_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class IssueCustomFieldTest < Test::Unit::TestCase - fixtures :issue_custom_fields - - # Replace this with your real tests. - def test_truth - assert_kind_of IssueCustomField, issue_custom_fields(:first) - end -end diff --git a/redmine/test/unit/issue_custom_value_test.rb b/redmine/test/unit/issue_custom_value_test.rb deleted file mode 100644 index 09c0551..0000000 --- a/redmine/test/unit/issue_custom_value_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class IssueCustomValueTest < Test::Unit::TestCase - fixtures :issue_custom_values - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/unit/issue_history_test.rb b/redmine/test/unit/issue_history_test.rb deleted file mode 100644 index 3da38e7..0000000 --- a/redmine/test/unit/issue_history_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class IssueHistoryTest < Test::Unit::TestCase - fixtures :issue_histories - - # Replace this with your real tests. - def test_truth - assert_kind_of IssueHistory, issue_histories(:first) - end -end diff --git a/redmine/test/unit/issue_status_test.rb b/redmine/test/unit/issue_status_test.rb deleted file mode 100644 index 8e7c0b9..0000000 --- a/redmine/test/unit/issue_status_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class IssueStatusTest < Test::Unit::TestCase - fixtures :issue_statuses - - # Replace this with your real tests. - def test_truth - assert_kind_of IssueStatus, issue_statuses(:first) - end -end diff --git a/redmine/test/unit/issue_test.rb b/redmine/test/unit/issue_test.rb deleted file mode 100644 index 3b31877..0000000 --- a/redmine/test/unit/issue_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class IssueTest < Test::Unit::TestCase - fixtures :issues - - # Replace this with your real tests. - def test_truth - assert_kind_of Issue, issues(:first) - end -end diff --git a/redmine/test/unit/mailer_test.rb b/redmine/test/unit/mailer_test.rb deleted file mode 100644 index 70615d7..0000000 --- a/redmine/test/unit/mailer_test.rb +++ /dev/null @@ -1,35 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'mailer' - -class MailerTest < Test::Unit::TestCase - FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures' - CHARSET = "utf-8" - - include ActionMailer::Quoting - - def setup - ActionMailer::Base.delivery_method = :test - ActionMailer::Base.perform_deliveries = true - ActionMailer::Base.deliveries = [] - - @expected = TMail::Mail.new - @expected.set_content_type "text", "plain", { "charset" => CHARSET } - end - - def test_issue_closed - @expected.subject = 'Mailer#issue_closed' - @expected.body = read_fixture('issue_closed') - @expected.date = Time.now - - assert_equal @expected.encoded, Mailer.create_issue_closed(@expected.date).encoded - end - - private - def read_fixture(action) - IO.readlines("#{FIXTURES_PATH}/mailer/#{action}") - end - - def encode(subject) - quoted_printable(subject, CHARSET) - end -end diff --git a/redmine/test/unit/member_test.rb b/redmine/test/unit/member_test.rb deleted file mode 100644 index 443c096..0000000 --- a/redmine/test/unit/member_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class MemberTest < Test::Unit::TestCase - fixtures :members - - # Replace this with your real tests. - def test_truth - assert_kind_of Member, members(:first) - end -end diff --git a/redmine/test/unit/news_test.rb b/redmine/test/unit/news_test.rb deleted file mode 100644 index db9b3ab..0000000 --- a/redmine/test/unit/news_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class NewsTest < Test::Unit::TestCase - fixtures :news - - # Replace this with your real tests. - def test_truth - assert_kind_of News, news(:first) - end -end diff --git a/redmine/test/unit/packages_test.rb b/redmine/test/unit/packages_test.rb deleted file mode 100644 index a5ebcdf..0000000 --- a/redmine/test/unit/packages_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class PackagesTest < Test::Unit::TestCase - fixtures :packages - - # Replace this with your real tests. - def test_truth - assert_kind_of Packages, packages(:first) - end -end diff --git a/redmine/test/unit/permission_test.rb b/redmine/test/unit/permission_test.rb deleted file mode 100644 index 306c2e6..0000000 --- a/redmine/test/unit/permission_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class PermissionTest < Test::Unit::TestCase - fixtures :permissions - - # Replace this with your real tests. - def test_truth - assert_kind_of Permission, permissions(:first) - end -end diff --git a/redmine/test/unit/project_test.rb b/redmine/test/unit/project_test.rb index 8a99125..9bafe9c 100644 --- a/redmine/test/unit/project_test.rb +++ b/redmine/test/unit/project_test.rb @@ -1,10 +1,77 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + require File.dirname(__FILE__) + '/../test_helper' class ProjectTest < Test::Unit::TestCase fixtures :projects - # Replace this with your real tests. + def setup + @project = projects(:ecookbook) + end + def test_truth - assert_kind_of Project, projects(:first) + assert_kind_of Project, @project + assert_equal "eCookbook", @project.name + end + + def test_update + assert_equal "eCookbook", @project.name + @project.name = "eCook" + assert @project.save, @project.errors.full_messages.join("; ") + @project.reload + assert_equal "eCook", @project.name + end + + def test_validate + @project.name = "" + assert !@project.save + assert_equal 1, @project.errors.count + assert_equal "can't be blank", @project.errors.on(:name) + end + + def test_public_projects + public_projects = Project.find(:all, :conditions => ["is_public=?", true]) + assert_equal 2, public_projects.length + assert_equal true, public_projects[0].is_public? + end + + def test_destroy + @project.destroy + assert_raise(ActiveRecord::RecordNotFound) { Project.find(@project.id) } + end + + def test_subproject_ok + sub = Project.find(2) + sub.parent = Project.find(1) + assert sub.save + assert_equal 1, sub.parent.id + assert_equal 2, Project.find(1).projects_count + end + + def test_subproject_invalid + sub = Project.find(2) + sub.parent = projects(:tracker) + assert !sub.save + end + + def test_subproject_invalid_2 + sub = Project.find(1) + sub.parent = projects(:onlinestore) + assert !sub.save end end diff --git a/redmine/test/unit/role_test.rb b/redmine/test/unit/role_test.rb deleted file mode 100644 index 90565ae..0000000 --- a/redmine/test/unit/role_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class RoleTest < Test::Unit::TestCase - fixtures :roles - - # Replace this with your real tests. - def test_truth - assert_kind_of Role, roles(:first) - end -end diff --git a/redmine/test/unit/tracker_test.rb b/redmine/test/unit/tracker_test.rb deleted file mode 100644 index f738f28..0000000 --- a/redmine/test/unit/tracker_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class TrackerTest < Test::Unit::TestCase - fixtures :trackers - - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/redmine/test/unit/user_test.rb b/redmine/test/unit/user_test.rb index d6a2a22..df255ae 100644 --- a/redmine/test/unit/user_test.rb +++ b/redmine/test/unit/user_test.rb @@ -1,10 +1,64 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + require File.dirname(__FILE__) + '/../test_helper' class UserTest < Test::Unit::TestCase fixtures :users - # Replace this with your real tests. def test_truth - assert_kind_of User, users(:first) + assert_kind_of User, users(:paulochon) + end + + def test_update + user = User.find(1) + assert_equal "admin", user.login + user.login = "john" + assert user.save, user.errors.full_messages.join("; ") + user.reload + assert_equal "john", user.login + end + + def test_validate + user = User.find(1) + user.login = "" + assert !user.save + assert_equal 2, user.errors.count + end + + def test_password + user = User.try_to_login("admin", "admin") + assert_kind_of User, user + assert_equal "admin", user.login + user.password = "hello" + assert user.save + + user = User.try_to_login("admin", "hello") + assert_kind_of User, user + assert_equal "admin", user.login + assert_equal User.hash_password("hello"), user.hashed_password + end + + def test_lock + user = User.find(1) + user.locked = true + assert user.save + + user = User.try_to_login("admin", "admin") + assert_equal nil, user end end diff --git a/redmine/test/unit/version_test.rb b/redmine/test/unit/version_test.rb deleted file mode 100644 index 91c52d4..0000000 --- a/redmine/test/unit/version_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class VersionTest < Test::Unit::TestCase - fixtures :versions - - # Replace this with your real tests. - def test_truth - assert_kind_of Version, versions(:first) - end -end diff --git a/redmine/test/unit/workflow_test.rb b/redmine/test/unit/workflow_test.rb deleted file mode 100644 index ff88a97..0000000 --- a/redmine/test/unit/workflow_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class WorkflowTest < Test::Unit::TestCase - fixtures :workflows - - # Replace this with your real tests. - def test_truth - assert_kind_of Workflow, workflows(:first) - end -end