kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,560 Commits 2 Branches 91 Tags 22 MiB
Commit Graph

2560 Commits

Author SHA1 Message Date
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
Eric Davis a41ba2aed7 Renamed the default "Assigned" status to "In Progress". #3605 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2939 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-20 05:06:14 +00:00
Eric Davis b887cef7af Moved object daddy helpers to their own module. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2938 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-20 00:36:55 +00:00
Eric Davis 6456f7c4a4 Updated some object_daddy exemplars for the Models. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2937 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-20 00:36:51 +00:00
Eric Davis 61c09b6442 Added shoulda macros to test Project's associations 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2936 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-19 00:27:13 +00:00
Eric Davis 257c92f8f9 Replaced a custom test with a shoulda macro. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2935 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-19 00:27:08 +00:00
Eric Davis a150689be9 Improved Project#copy to copy more data from the source Project. #3367 
* Versions
* Associate the copied issues with the new versions
* Wiki
* WikiPages
* WikiContents
* IssueCategories

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2934 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-19 00:07:37 +00:00
Eric Davis 6531c3f887 Preselect the issue custom fields from the source project when copying. #4045 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2933 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-19 00:07:32 +00:00
Eric Davis 945ea9b01c Refactored duplicated test code to a setup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2932 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-19 00:07:27 +00:00
Eric Davis 548d5a21f6 Converted Project#copy test to use shoulda 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2931 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-19 00:07:23 +00:00
Eric Davis 35333367df Configured object_daddy to help generate test data instead of fixtures. #4004 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2930 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-18 22:25:00 +00:00
Azamat Hackimov ee9c2d3d88 pt-BR update (#4040) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2929 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-18 21:27:26 +00:00
Eric Davis 70118fb136 Adding missing database indexes for foreign keys and STI fields. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2928 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-17 22:23:29 +00:00
Eric Davis 07ffad4a7e Rename the wiki toolbar's JavaScript variable, 'toolbar' conflicts with 
the browser's variable.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2927 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-17 21:17:46 +00:00
Eric Davis 5e539c31b0 Fixed the generated test in the redmine_plugin_model. (#3927) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2926 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-17 21:08:33 +00:00
Eric Davis 4425acafff Setup shoulda for testing. (#4005) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2925 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-17 20:37:23 +00:00
Jean-Philippe Lang afd2d4afc6 Fixed: HTML entities displayed when editing an issue note (#3996). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2924 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 10:36:11 +00:00
Jean-Philippe Lang 0b3e3471b0 Makes migration scripts load tickets in batches (#4011). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2923 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 10:12:07 +00:00
Jean-Philippe Lang 0ac07afc67 Fixes migration scripts broken by r2726. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2922 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 10:08:22 +00:00
Jean-Philippe Lang 6224f7caca da locale updated (closes #3919). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2921 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 09:24:45 +00:00
Jean-Philippe Lang 1088c7360b el locale updated (closes #3932). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2920 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 09:20:57 +00:00
Jean-Philippe Lang c5d8bbeb8c translation updates (closes #4016, #4017). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2919 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 09:17:32 +00:00
Jean-Philippe Lang 4c42e1a08f ko locale updated (closes #3954). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2918 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 09:15:33 +00:00
Jean-Philippe Lang ca250c1f2e ro locale updated (closes #2900). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2917 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 08:33:46 +00:00
Jean-Philippe Lang f65133093a Fixes project shortcut combo. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2916 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-11 08:20:39 +00:00
Jean-Philippe Lang d8ba5c2a06 Fixes MailHandler for ruby1.9. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2915 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 15:25:34 +00:00
Jean-Philippe Lang 4450e6f24b String#each removed in ruby1.9. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2914 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 15:19:27 +00:00
Jean-Philippe Lang 9cd662f8dc Fixes some test failures due to Array#to_s behaviour in ruby1.9. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2913 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 15:14:08 +00:00
Jean-Philippe Lang 22d3d5a3b0 Defines String#to_a (Object#to_a removed in ruby1.9). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2912 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 15:09:19 +00:00
Jean-Philippe Lang 531eb65557 Fixes a wrong number of arguments error with ruby1.9. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2911 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 15:04:08 +00:00
Jean-Philippe Lang 38dc4d1cf9 Sets file encoding to utf-8 for ruby 1.9. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2910 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 15:00:28 +00:00
Jean-Philippe Lang ac8a67191f Renames uploaded_test_file helper. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2909 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 14:56:29 +00:00
Jean-Philippe Lang 94d34887cc Change deprecated dbfile parameter. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2908 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 14:37:47 +00:00
Jean-Philippe Lang 8ffc61f66c Completes r2856 (#3979). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2907 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 11:11:01 +00:00