diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-05-09 08:05:37 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-05-09 08:05:37 +0000 |
| commit | 6fd9d9ed7321615c61feb4e69fd61bdbaaf72faa (patch) | |
| tree | 0a33fae6399f98ac8403629ba7f28166867d4eeb /config | |
| parent | b540046ed7084ba50f5ca280f3ffae0751af8142 (diff) | |
| download | redmine-6fd9d9ed7321615c61feb4e69fd61bdbaaf72faa.tar.gz redmine-6fd9d9ed7321615c61feb4e69fd61bdbaaf72faa.zip | |
Import time entries (#28234).
Patch by Gregor Schmidt.
git-svn-id: http://svn.redmine.org/redmine/trunk@18146 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 50f75877a..2310d1eec 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1022,6 +1022,7 @@ en: label_member_management_all_roles: All roles label_member_management_selected_roles_only: Only these roles label_import_issues: Import issues + label_import_time_entries: Import time entries label_select_file_to_import: Select the file to import label_fields_separator: Field separator label_fields_wrapper: Field wrapper diff --git a/config/routes.rb b/config/routes.rb index 4c65f976b..3c1fd0256 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -65,6 +65,7 @@ Rails.application.routes.draw do get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details' get '/issues/imports/new', :to => 'imports#new', :defaults => { :type => 'IssueImport' }, :as => 'new_issues_import' + get '/time_entries/imports/new', :to => 'imports#new', :defaults => { :type => 'TimeEntryImport' }, :as => 'new_time_entries_import' post '/imports', :to => 'imports#create', :as => 'imports' get '/imports/:id', :to => 'imports#show', :as => 'import' match '/imports/:id/settings', :to => 'imports#settings', :via => [:get, :post], :as => 'import_settings' |