-
+<%= f.hidden_field :lock_version %>
<%= submit_tag l(:button_save) %>
<% end %>
\ No newline at end of file
diff --git a/redmine/app/views/issues/show.rhtml b/redmine/app/views/issues/show.rhtml
index acba6af0c..fc48e47a1 100644
--- a/redmine/app/views/issues/show.rhtml
+++ b/redmine/app/views/issues/show.rhtml
@@ -49,7 +49,7 @@
<%=l(:label_history)%>
-<% for history in @issue.histories.find(:all, :include => :author) %>
+<% for history in @issue.histories.find(:all, :include => [:author, :status]) %>
<%= format_date(history.created_on) %>
<%= history.author.display_name %>
diff --git a/redmine/db/migrate/001_setup.rb b/redmine/db/migrate/001_setup.rb
index 65fd23422..00d788bec 100644
--- a/redmine/db/migrate/001_setup.rb
+++ b/redmine/db/migrate/001_setup.rb
@@ -120,7 +120,8 @@ class Setup < ActiveRecord::Migration
t.column "assigned_to_id", :integer
t.column "priority_id", :integer, :default => 0, :null => false
t.column "fixed_version_id", :integer
- t.column "author_id", :integer, :default => 0, :null => false
+ t.column "author_id", :integer, :default => 0, :null => false
+ t.column "lock_version", :integer, :default => 0, :null => false
t.column "created_on", :timestamp
t.column "updated_on", :timestamp
end
diff --git a/redmine/lang/de.yml b/redmine/lang/de.yml
index cdfffabde..7fcecca94 100644
--- a/redmine/lang/de.yml
+++ b/redmine/lang/de.yml
@@ -58,6 +58,7 @@ notice_successful_update: Erfolgreiches Update.
notice_successful_delete: Erfolgreiche Auslassung.
notice_successful_connection: Erfolgreicher Anschluß.
notice_file_not_found: Erbetene Akte besteht nicht oder ist gelöscht worden.
+notice_locking_conflict: Data have been updated by another user.
gui_validation_error: 1 Störung
gui_validation_error_plural: %d Störungen
diff --git a/redmine/lang/en.yml b/redmine/lang/en.yml
index 7fd806362..780d06c34 100644
--- a/redmine/lang/en.yml
+++ b/redmine/lang/en.yml
@@ -58,6 +58,7 @@ notice_successful_update: Successful update.
notice_successful_delete: Successful deletion.
notice_successful_connection: Successful connection.
notice_file_not_found: Requested file doesn't exist or has been deleted.
+notice_locking_conflict: Data have been updated by another user.
gui_validation_error: 1 error
gui_validation_error_plural: %d errors
diff --git a/redmine/lang/es.yml b/redmine/lang/es.yml
index a9806b3e3..85d78d31e 100644
--- a/redmine/lang/es.yml
+++ b/redmine/lang/es.yml
@@ -58,6 +58,7 @@ notice_successful_update: Successful update.
notice_successful_delete: Successful deletion.
notice_successful_connection: Successful connection.
notice_file_not_found: Requested file doesn't exist or has been deleted.
+notice_locking_conflict: Data have been updated by another user.
gui_validation_error: 1 error
gui_validation_error_plural: %d errores
diff --git a/redmine/lang/fr.yml b/redmine/lang/fr.yml
index 5c2936801..a321b7dae 100644
--- a/redmine/lang/fr.yml
+++ b/redmine/lang/fr.yml
@@ -58,6 +58,7 @@ notice_successful_update: Mise à jour effectuée avec succès.
notice_successful_delete: Suppression effectuée avec succès.
notice_successful_connection: Connection réussie.
notice_file_not_found: Le fichier demandé n'existe pas ou a été supprimé.
+notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
gui_validation_error: 1 erreur
gui_validation_error_plural: %d erreurs