Mercurial > hg > soundsoftware-site
changeset 1435:d0ac3348d28d luisf
Merge.
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Wed, 09 Oct 2013 19:17:47 +0100 |
| parents | 2c723b9f5b87 (current diff) a9cfc6dcfb83 (diff) |
| children | 31de8828252a |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/redmine_bibliography/app/controllers/publications_controller.rb Tue Oct 08 17:07:28 2013 +0100 +++ b/plugins/redmine_bibliography/app/controllers/publications_controller.rb Wed Oct 09 19:17:47 2013 +0100 @@ -82,10 +82,8 @@ def edit find_project_by_project_id unless params[:project_id].nil? - @edit_view = true; @publication = Publication.find(params[:id]) @selected_bibtex_entry_type_id = @publication.bibtex_entry.entry_type - @bibtype_fields = BibtexEntryType.fields(@selected_bibtex_entry_type_id) end
--- a/plugins/redmine_bibliography/app/views/publications/_authorship_fields.html.erb Tue Oct 08 17:07:28 2013 +0100 +++ b/plugins/redmine_bibliography/app/views/publications/_authorship_fields.html.erb Wed Oct 09 19:17:47 2013 +0100 @@ -7,7 +7,11 @@ <p class="author_associated search_author_tie"> <%= f.check_box :search_author_tie, :label => '' -%> - <span>Not associated with any SoundSoftware site user.</span> + <% unless f.object.search_author_tie %> + <span>Not associated with any SoundSoftware site user.</span> + <% else %> + <span>Associated with <%= render_authorship_link(f.object.search_author_class, f.object.search_author_id) -%>.</span> + <% end %> </p> <%= f.hidden_field :search_author_class -%>