Commit Graph

2443 Commits

Author SHA1 Message Date
Jean-Philippe Lang 92ec35e657 Unified UsersController#list and #index.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2991 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-29 18:48:19 +00:00
Jean-Philippe Lang e64fb6a728 Fixes users links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2990 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-29 18:44:16 +00:00
Jean-Philippe Lang e117dc8c9c Include missing fixtures.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2989 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-29 18:40:00 +00:00
Jean-Philippe Lang a842769c3f AccountController#show (/account/show/:id) moved to UsersController#show (/users/:id).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2988 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-29 18:37:00 +00:00
Jean-Philippe Lang ac56d1d5e5 Do not show user profile if no visible project or activity (#4129, #3720).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2986 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-29 18:09:40 +00:00
Jean-Philippe Lang 72d208cb35 Typo fixed (#4134).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2985 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-29 17:59:09 +00:00
Jean-Philippe Lang 86874785b7 Fixed error on repository when there are no comments in a changeset (#4126).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2983 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-29 17:55:59 +00:00
Jean-Philippe Lang a658679d29 Add etag check on the activity view to avoid rendering when not modified.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2982 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 17:27:24 +00:00
Jean-Philippe Lang 06fff6295c Add indexes on various timestamps to speed up the activity view.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2981 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 16:56:46 +00:00
Jean-Philippe Lang 9aa2b6b9a4 IssuesController#destroy accepts POST only (#4107).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2980 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 13:38:48 +00:00
Jean-Philippe Lang 821f9eb390 HTML escaping (#4106).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 13:28:36 +00:00
Jean-Philippe Lang a3fcdfe391 Add translations for new permission.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2978 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 12:13:51 +00:00
Jean-Philippe Lang 97b4e75478 Add a permission to remove issue watchers (#2450).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2977 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 12:11:53 +00:00
Jean-Philippe Lang 6fedbf60d5 Allow project forums copy.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2976 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 11:23:46 +00:00
Jean-Philippe Lang 6dfe0395a5 Display stats about objects that can be copied.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2975 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 11:10:35 +00:00
Jean-Philippe Lang 1a1bfbfb07 Do not ignore parent project setting on project copy (#3386).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2974 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:56:32 +00:00
Jean-Philippe Lang a18676b669 Prevent mass-assignment warnings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2973 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:51:21 +00:00
Jean-Philippe Lang 4e73685af7 Reset timestamps and wiki page hierarchy on project copy.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2972 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:44:03 +00:00
Jean-Philippe Lang 875eb47ad1 Prevent mass-assignment warnings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2971 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:35:59 +00:00
Jean-Philippe Lang 2e675342cb Removes debug message.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2970 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:31:01 +00:00
Jean-Philippe Lang a9fb11c0f5 Fixes project wiki copy.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2969 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:30:39 +00:00
Jean-Philippe Lang eecec44ed2 Add a test that breaks before r2967 (broken project wiki copy).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2968 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-25 10:11:06 +00:00
Jean-Philippe Lang 9f12a14382 Wiki auto creation temporary disabled until project wiki copy is fixed (2 wikis created).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2967 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 16:12:13 +00:00
Jean-Philippe Lang 5b787785b4 Project copy: let the user choose what to copy from the source project (everything by default).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2966 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 13:30:23 +00:00
Jean-Philippe Lang 6842941adc Removes debug code.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2965 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 12:33:34 +00:00
Jean-Philippe Lang 383b2bd903 Small fix to HTML title.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2964 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 12:33:08 +00:00
Jean-Philippe Lang 83717a9b75 Add mail field to admin user search filter (#3882).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2963 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 12:21:09 +00:00
Jean-Philippe Lang 9233a07a23 Adds a test for attached image inside a link (#4033).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2962 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 12:19:22 +00:00
Jean-Philippe Lang de8dcc5b26 Sets proper content type for plain text mails (#3970).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2961 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 11:57:01 +00:00
Jean-Philippe Lang f206dfe9b5 Reverts r2770 (#3391).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2960 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 11:35:35 +00:00
Jean-Philippe Lang a68d8a7b32 Sets the current project as the default value of project jump box (#4053).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2959 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 11:29:49 +00:00
Jean-Philippe Lang 2cec9f87ab Translation updates (closes #4054, #4060, #4075).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2958 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 11:22:06 +00:00
Jean-Philippe Lang cabf052127 Prevent undefined method `<=>' for nil:NilClass in AbstractAdapter (#4098).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2957 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 11:08:09 +00:00
Jean-Philippe Lang 2445250960 Fixes form buttons on projects/settings/activities (closes #4083).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2956 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-22 17:51:23 +00:00
Jean-Philippe Lang 6ffe1926ab Remove hard coded string in a view (closes #4076).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2955 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-22 17:46:54 +00:00
Jean-Philippe Lang 04ae25f6b0 Do not render hidden news edit form if user is not allowed to edit (closes #4068).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-22 17:42:17 +00:00
Jean-Philippe Lang e5c4cfc688 Add missing strings (rake locales:update).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-22 17:39:12 +00:00
Eric Davis ff3d0fe4db Fixed some merge bugs. #4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:35:03 +00:00
Eric Davis 2e0cbd2840 Added all list and boolean custom data fields to the Time Report. #4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2951 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:57 +00:00
Eric Davis 37d401ac58 When a specific TimeEntryActivity are change, associated TimeEntries will be
re-assigned to the correct record.

* Renamed build to create since the methods now create objects.
* Removed call to Project#save that isn't needed since objects are saved directly now.
* Wrapped the activity creation and updates in a SQL transaction so TimeEntries
  will remain in a consistent state if there is an error.
* When a Project's TimeEntryActivities are destroyed, they are now
  reassigned to the parent TimeEntryActivity.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2950 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:52 +00:00
Eric Davis 5833ba9f81 Added a Activities tab to Project Settings
* Changed Project#activities to allow getting inactive Activities also:
  * Changed the Enumeration#all named_scope to exclude project specific Activities
  * Changed the Project has_many time_entry_activities to include all by default
    and provided an #active method to filter them to active ones only
  * Split Project#activities to two methods and gave it a parameter that is used
    to determine if inactive activities are included (default is no)
* Added a reset button to delete all project specific activities.
* Added ProjectsController#reset_activities to remove the project
  specific activities
* Added a HTTP DELETE route for reset_activities
* Changed the permissions for managing project activities to have access to the
  ProjectsController#reset_activities action
* Added a way to bulk save Project specific Activities in ProjectsController
  * #save_activities will save all the changed activities, including update the
    existing records
  * Added helper methods to the controller which will be refactored later
  * Allow the same TimeEntryActivity names on different projects

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2949 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:45 +00:00
Eric Davis e615266e9a Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities
* Added Project#activities to return all the Systemwide and Project specific
  activities, excluding Systemwide ones that are overridden.
* Added some tests for TimelogHelper.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:39 +00:00
Eric Davis 29301c8a38 Added project specific Enumeration overrides.
These will be used to track if Enumeration's custom data or active state
is overridden on a project.  An overridden Enumeration is one that is associated
with a parent Enumeration.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2947 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:34 +00:00
Eric Davis e76d4c5c4c Added an active field track if an Enumeration is active on the frontend view.
* Changed TimelogHelper#activity_collection_for_select_options to only use
  active TimeEntryActivities.
* Changed TimelogHelper#activity_collection_for_select_options to return a blank
  option if the time_entry's current activity is inactive.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:28 +00:00
Eric Davis ac4937a767 Enumerations can now have custom fields defined on them. #4077
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:22 +00:00
Eric Davis 29ab7b4108 Updated the unit test so Enumerations are tested separately from the subclasses.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2944 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:34:17 +00:00
Jean-Philippe Lang 07aa3c55bd Contextual quick search (#3263).
Eg. when viewing issues, the quick search will search issues only.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2943 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 17:07:18 +00:00
Eric Davis 739e11702a Change the order of checkboxes for boolean custom fields.
Broken in r2887 for the Rails 2.3.4 upgrade.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2942 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 03:31:20 +00:00
Eric Davis d40756d611 Renamed Project#public named_scope so it will not override Ruby's public method
#4056

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2941 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 03:21:31 +00:00
Eric Davis 50bab8b429 Mocha is needed for tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2940 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 03:13:24 +00:00