Mercurial > hg > soundsoftware-site
annotate .svn/pristine/2f/2fe801d5801d8321bfdbd57f3425598592dd401b.svn-base @ 1519:afce8026aaeb redmine-2.4-integration
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:34:53 +0100 |
parents | 038ba2d95de8 |
children |
rev | line source |
---|---|
Chris@1296 | 1 <% if @journal.frozen? %> |
Chris@1296 | 2 $("#change-<%= @journal.id %>").remove(); |
Chris@1296 | 3 <% else %> |
Chris@1296 | 4 $("#journal-<%= @journal.id %>-notes").replaceWith('<%= escape_javascript(render_notes(@journal.issue, @journal, :reply_links => authorize_for('issues', 'edit'))) %>'); |
Chris@1296 | 5 $("#journal-<%= @journal.id %>-notes").show(); |
Chris@1296 | 6 $("#journal-<%= @journal.id %>-form").remove(); |
Chris@1296 | 7 <% end %> |
Chris@1296 | 8 |
Chris@1296 | 9 <%= call_hook(:view_journals_update_js_bottom, { :journal => @journal }) %> |