scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-10 05:46:47 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1776 from okriuchykhin/ok_SCI_3477

Browse source 
Fix protocol metadata editing in repository [SCI-3477]
This commit is contained in:
Alex Kriuchykhin 2019-05-17 09:42:13 +02:00 • committed by GitHub
commit df59c54bd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/protocols_controller.rb
View file

@ -179,7 +179,7 @@ class ProtocolsController < ApplicationController
partial: 'protocols/header/authors_label.html.erb' partial: 'protocols/header/authors_label.html.erb'
), ),
description_label: render_to_string( description_label: render_to_string(
partial: 'protocols/header/description_label.html.erb' partial: 'protocols/header/description_label.html.erb', locals: { edit_mode: true }
) )
} }
end end

6
app/views/protocols/header/_description_label.html.erb
View file

@ -1,9 +1,9 @@
<% if can_manage_protocol_in_repository?(@protocol) && edit_mode %> <% if can_manage_protocol_in_repository?(@protocol) && edit_mode %>
<%= render partial: "my_modules/protocols/protocol_description_form", locals: <%= render partial: "my_modules/protocols/protocol_description_form.html.erb", locals:
{ {
protocol: @protocol, protocol: @protocol,
update_url: description_protocol_path(@protocol, format: :json) update_url: description_protocol_path(@protocol, format: :json)
} }
%> %>
<% elsif @protocol.description.present? %> <% elsif @protocol.description.present? %>
<%= custom_auto_link(@protocol.tinymce_render(:description), <%= custom_auto_link(@protocol.tinymce_render(:description),
@ -12,4 +12,4 @@
team: current_team) %> team: current_team) %>
<% else %> <% else %>
<span style="font-size: 16px"><%= t('my_modules.protocols.protocol_status_bar.no_description') %></span> <span style="font-size: 16px"><%= t('my_modules.protocols.protocol_status_bar.no_description') %></span>
<% end %> <% end %>