jro_apps/redmine Commit - r2222:e0bda97b6f93

0

app/controllers/application.rb +5 -1

               # TODO: move to model
               def attach_files(obj, attachments)
                 attached = []
+                unsaved = []
                 if attachments && attachments.is_a?(Hash)
                   attachments.each_value do |attachment|
                     file = attachment['file']
                                           :file => file,
                                           :description => attachment['description'].to_s.strip,
                                           :author => User.current)
-                    attached << a unless a.new_record?
+                    a.new_record? ? (unsaved << a) : (attached << a)
+                  end
+                  if unsaved.any?
+                    flash[:warning] = l(:warning_attachments_not_saved, unsaved.size)
                   end
                 end
                 attached

0

lang/bg.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/ca.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/cs.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/da.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/de.yml +1 0

             enumeration_doc_categories: Dokumentenkategorien
             enumeration_activities: Aktivitäten (Zeiterfassung)
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/en.yml +2 0

             error_scm_annotate: "The entry does not exist or can not be annotated."
             error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+            warning_attachments_not_saved: "%d file(s) could not be saved."
             mail_subject_lost_password: Your %s password
             mail_body_lost_password: 'To change your password, click on the following link:'
             mail_subject_register: Your %s account activation

0

lang/es.yml +1 0

             text_wiki_destroy_confirmation: ¿Seguro que quiere borrar el wiki y todo su contenido?
             text_workflow_edit: Seleccionar un flujo de trabajo para actualizar
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/fi.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/fr.yml +2 0

             error_scm_annotate: "L'entrée n'existe pas ou ne peut pas être annotée."
             error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
+            warning_attachments_not_saved: "%d fichier(s) n'ont pas pu être sauvegardés."
             mail_subject_lost_password: Votre mot de passe %s
             mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant:'
             mail_subject_register: Activation de votre compte %s

0

lang/he.yml +1 0

             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/hu.yml +1 0

             text_diff_truncated: '... A diff fájl vége nem jelenik meg, mert hosszab, mint a megjeleníthető sorok száma.'
             setting_diff_max_lines_displayed: A megjelenítendő sorok száma (maximum) a diff fájloknál
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/it.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/ja.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/ko.yml +1 0

             text_diff_truncated: '... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.'
             setting_diff_max_lines_displayed: 차이점보기에 표시할 최대 줄수
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/lt.yml +1 0

             enumeration_doc_categories: Dokumento kategorijos
             enumeration_activities: Veiklos (laiko sekimas)
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/nl.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/no.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/pl.yml +1 0

             text_diff_truncated: '... Ten plik różnic został przycięty ponieważ jest zbyt długi.'
             setting_diff_max_lines_displayed: Maksymalna liczba linii różnicy do pokazania
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/pt-br.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/pt.yml +1 0

             text_diff_truncated: '... Este diff foi truncado porque excede o tamanho máximo que pode ser mostrado.'
             setting_diff_max_lines_displayed: Número máximo de linhas de diff mostradas
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/ro.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/ru.yml +1 0

             text_workflow_edit: Выберите роль и трекер для редактирования последовательности состояний
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/sk.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/sr.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/sv.yml +1 0

             enumeration_doc_categories: Dokumentkategorier
             enumeration_activities: Aktiviteter (tidsuppföljning)
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/th.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/tr.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/uk.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/vn.yml +1 0

             text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
             setting_diff_max_lines_displayed: Max number of diff lines displayed
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/zh-tw.yml +1 0

             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (時間追蹤)
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

lang/zh.yml +1 0

             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
             text_plugin_assets_writable: Plugin assets directory writable
+            warning_attachments_not_saved: "%d file(s) could not be saved."

0

public/images/warning.png binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

0

public/stylesheets/application.css +8 0

             	color: #005f00;
             }
+            div.flash.warning {
+              background: url(../images/warning.png) 8px 5px no-repeat;
+            	background-color: #FFEBC1;
+            	border-color: #FDBF3B;
+            	color: #A6750C;
+              text-align: left;
+            }
             .nodata, .warning {
                 text-align: center;
             	background-color: #FFEBC1;

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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