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 /app/views/timelog | |
| 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 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_sidebar.html.erb | 10 | ||||
| -rw-r--r-- | app/views/timelog/index.html.erb | 4 | ||||
| -rw-r--r-- | app/views/timelog/report.html.erb | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/app/views/timelog/_sidebar.html.erb b/app/views/timelog/_sidebar.html.erb new file mode 100644 index 000000000..f54a73f81 --- /dev/null +++ b/app/views/timelog/_sidebar.html.erb @@ -0,0 +1,10 @@ +<h3><%= l(:label_spent_time) %></h3> + +<ul> + <li><%= link_to l(:label_time_entries_visibility_all), _time_entries_path(@project, nil, :set_filter => 1) %></li> + <% if User.current.allowed_to?(:log_time, @project, :global => true) %> + <li><%= link_to l(:button_import), new_time_entries_import_path %></li> + <% end %> +</ul> + +<%= render_sidebar_queries(TimeEntryQuery, @project) %> diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index 35e833efb..3c904f3ec 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:button_log_time), +<%= link_to l(:button_log_time), _new_time_entry_path(@project, @query.filtered_issue_id), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %> </div> @@ -42,7 +42,7 @@ <% end %> <% content_for :sidebar do %> - <%= render_sidebar_queries(TimeEntryQuery, @project) %> + <%= render :partial => 'timelog/sidebar' %> <% end %> <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_details)) %> diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb index b5307c4af..ae64a891e 100644 --- a/app/views/timelog/report.html.erb +++ b/app/views/timelog/report.html.erb @@ -78,7 +78,7 @@ <% end %> <% content_for :sidebar do %> - <%= render_sidebar_queries(TimeEntryQuery, @project) %> + <%= render :partial => 'sidebar' %> <% end %> <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_report)) %> |