patch_warning_on_csv_export_v2.diff

Patch - Version 2 - Daniel Felix, 2013-04-16 09:19

Download (3.49 KB)

View differences:

app/controllers/issues_controller.rb
69 69
      else
70 70
        @limit = per_page_option
71 71
      end
72
      
73
      @csv_limit = Setting.issues_export_limit.to_i
72 74

  
73 75
      @issue_count = @query.issue_count
74 76
      @issue_pages = Paginator.new @issue_count, @limit, params['page']
app/views/issues/index.html.erb
65 65

  
66 66
<% other_formats_links do |f| %>
67 67
  <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
68
  <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
68
  <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
69 69
  <%= f.link_to 'PDF', :url => params %>
70 70
<% end %>
71 71

  
72 72
<div id="csv-export-options" style="display:none;">
73 73
  <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
74
  
75
  <% if @issue_count > @csv_limit%>
76
  <div class="flash warning">
77
    <%= l(:warning_export_limit, :export => @csv_limit, :total => @issue_count) %>
78
  </div>
79
  <% end %>
80
  
74 81
  <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
75 82
  <p>
76 83
    <label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label><br />
config/locales/de.yml
744 744
  label_today: heute
745 745
  label_topic_plural: Themen
746 746
  label_total: Gesamtzahl
747
  label_total_time: Gesamtzeit
747 748
  label_tracker: Tracker
748 749
  label_tracker_new: Neuer Tracker
749 750
  label_tracker_plural: Tracker
......
1099 1100
  version_status_open: offen
1100 1101

  
1101 1102
  warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
1102
  label_total_time: Gesamtzeit
1103
  warning_export_limit: "Der Export wird nur %{export} von %{total} Tickets enthalten!"
config/locales/en-GB.yml
1090 1090
  field_generate_password: Generate password
1091 1091
  setting_default_projects_tracker_ids: Default trackers for new projects
1092 1092
  label_total_time: Total
1093
  warning_export_limit: "Export contains only %{export} of %{total}! issues!"
config/locales/en.yml
1083 1083
  description_date_from: Enter start date
1084 1084
  description_date_to: Enter end date
1085 1085
  text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'
1086
  warning_export_limit: "Export contains only %{export} of %{total}! issues!"