diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-15 07:55:41 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-15 07:55:41 +0000 |
| commit | fb2cbdc6cc9a63951b0bdc44df7f8aebe8c36197 (patch) | |
| tree | 9c9775df5a6449514c498f1146cbebdb53b20932 | |
| parent | 6062a0a89d50ce4afa362d2767e3a55c2801d657 (diff) | |
| download | redmine-fb2cbdc6cc9a63951b0bdc44df7f8aebe8c36197.tar.gz redmine-fb2cbdc6cc9a63951b0bdc44df7f8aebe8c36197.zip | |
Merged r10991 from trunk (#12568).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@11008 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/journals/edit.js.erb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/journals/edit.js.erb b/app/views/journals/edit.js.erb index 73b8082a4..96cf6b4f8 100644 --- a/app/views/journals/edit.js.erb +++ b/app/views/journals/edit.js.erb @@ -1,2 +1,8 @@ $("#journal-<%= @journal.id %>-notes").hide(); -$("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>'); + +if ($("form#journal-<%= @journal.id %>-form").length > 0) { + // journal edit form already loaded + $("#journal-<%= @journal.id %>-form").show(); +} else { + $("#journal-<%= @journal.id %>-notes").after('<%= escape_javascript(render :partial => 'notes_form') %>'); +} |