feature-1422.patch

Mizuki ISHIKAWA, 2020-03-17 08:51

Download (1.42 KB)

View differences:

app/views/activities/index.html.erb
32 32
<% content_for :sidebar do %>
33 33
<%= form_tag({}, :method => :get, :id => 'activity_scope_form') do %>
34 34
<h3><%= l(:label_activity) %></h3>
35
<p>
36
  <%= l(:label_days_to, :days => @days, :date => date_field_tag('from', '', :value => (@date_to-1), :size => 10)).html_safe  %>
37
  <%= calendar_for('from') %>
38
</p>
35 39
<ul>
36 40
<% @activity.event_types.each do |t| %>
37 41
  <li>
......
48 52
    <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
49 53
<% end %>
50 54
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
51
<%= hidden_field_tag('from', params[:from]) unless params[:from].blank? %>
52 55
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => 'submit' %></p>
53 56
<% end %>
54 57
<% end %>
config/locales/en.yml
942 942
  label_ascending: Ascending
943 943
  label_descending: Descending
944 944
  label_date_from_to: From %{start} to %{end}
945
  label_days_to: "%{days} days to %{date}"
945 946
  label_wiki_content_added: Wiki page added
946 947
  label_wiki_content_updated: Wiki page updated
947 948
  label_group: Group