jro_apps/redmine Commit - r128:6487c1803fa9

0

app/models/attachment.rb +5 -1

               belongs_to :container, :polymorphic => true
               belongs_to :author, :class_name => "User", :foreign_key => "author_id"
+              @@max_size = $RDM_ATTACHMENT_MAX_SIZE || 5*1024*1024
+              cattr_reader :max_size
               validates_presence_of :container, :filename
+              validates_inclusion_of :filesize, :in => 1..@@max_size
             	def file=(incomming_file)
             		unless incomming_file.nil?
             			@temp_file = incomming_file

0

app/views/documents/show.rhtml +1 -1

               <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %>
                 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
                 <%= link_to_function image_tag('add'), "addFileField()" %></label>
-                <%= file_field_tag 'attachments[]', :size => 30  %></p>
+                <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
               <%= submit_tag l(:button_add) %>
               <%= end_form_tag %>
             <% end %>

0

app/views/issues/show.rhtml +1 -1

               <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") %>
               <p id="attachments_p"><label><%=l(:label_attachment_new)%>&nbsp;
               <%= link_to_function image_tag('add'), "addFileField()" %></label>
-              <%= file_field_tag 'attachments[]', :size => 30  %></p>
+              <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
               <%= submit_tag l(:button_add) %>
               <%= end_form_tag %>
             <% end %>

0

app/views/projects/add_document.rhtml +1 -1

             <div class="box">
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
             <%= link_to_function image_tag('add'), "addFileField()" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
             </div>
             <%= submit_tag l(:button_create) %>

0

app/views/projects/add_file.rhtml +1 -1

             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
             <%= link_to_function image_tag('add'), "addFileField()" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
             </div>
             <%= submit_tag l(:button_add) %>
             <%= end_form_tag %>

0

app/views/projects/add_issue.rhtml +1 -1

             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
             <%= link_to_function image_tag('add'), "addFileField()" %></label>
-            <%= file_field_tag 'attachments[]', :size => 30  %></p>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
             </div>
             <!--[eoform:issue]-->

0

config/config_custom.example.rb +4 0

@@ -63,3 +63,7
63	# Textile formatting is automativaly disabled if RedCloth is not available	63	# Textile formatting is automativaly disabled if RedCloth is not available
64	# Set to true to manually disable.	64	# Set to true to manually disable.
65	# $RDM_TEXTILE_DISABLED = true	65	# $RDM_TEXTILE_DISABLED = true
		66
		67	# Maximum size for attachments (in bytes)
		68	# Default to 5 MB
		69	# $RDM_ATTACHMENT_MAX_SIZE = 510241024

0

lang/de.yml +1 0

             label_deleted: gelöscht
             label_latest_revision: Neueste Neuausgabe
             label_view_revisions: Die Neuausgaben ansehen
+            label_max_size: Maximale Größe
             button_login: Einloggen
             button_submit: Einreichen

0

lang/en.yml +1 0

             label_deleted: deleted
             label_latest_revision: Latest revision
             label_view_revisions: View revisions
+            label_max_size: Maximum size
             button_login: Login
             button_submit: Submit

0

lang/es.yml +1 0

             label_deleted: suprimido
             label_latest_revision: La revisión más última
             label_view_revisions: Ver las revisiones
+            label_max_size: Tamaño máximo
             button_login: Conexión
             button_submit: Someter

0

lang/fr.yml +1 0

             label_deleted: supprimé
             label_latest_revision: Dernière révision
             label_view_revisions: Voir les révisions
+            label_max_size: Taille maximale
             button_login: Connexion
             button_submit: Soumettre

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages