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

Fix version number for draft [SCI-7989]

Browse source
This commit is contained in:
Anton 2023-02-24 15:32:10 +01:00
parent aa6e9bf1bf
commit 60cda9b6f2
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/protocol.rb
View file

@ -560,6 +560,7 @@ class Protocol < ApplicationRecord
draft.published_by = nil
draft.published_on = nil
draft.version_comment = nil
draft.previous_version = self
return draft if draft.invalid?

31
app/views/protocols/index/_protocol_versions_modal.html.erb
View file

@ -9,42 +9,47 @@
</div>
<div class="modal-body">
<% if @protocol.draft.present? %>
<% draft = @protocol.draft %>
<div class="protocol-version-row">
<div class="protocol-link">
<%= link_to protocol_path(@protocol.draft) do %>
<%= t('protocols.index.versions.draft_html', parent_version: @protocol.draft.version_number) %>
<%= link_to protocol_path(draft) do %>
<% if draft.previous_version %>
<%= t('protocols.index.versions.draft_html', parent_version: draft.previous_version.version_number) %>
<% else %>
<%= t('protocols.index.versions.first_draft_html') %>
<% end %>
<% end %>
</div>
<div class="protocol-metadata">
<%= t('protocols.index.versions.draft_modification_info',
modified_on: @protocol.draft.updated_at.present? ? l(@protocol.draft.updated_at, format: :full_date) : '',
modified_by: @protocol.draft.last_modified_by&.full_name) %>
modified_on: draft.updated_at.present? ? l(draft.updated_at, format: :full_date) : '',
modified_by: draft.last_modified_by&.full_name) %>
</div>
<div class="protocol-actions">
<% if can_manage_protocol_in_repository?(@protocol.draft) %>
<%= button_to publish_protocol_path(@protocol.draft), class: "btn btn-light publish-draft" do %>
<% if can_manage_protocol_in_repository?(draft) %>
<%= button_to publish_protocol_path(draft), class: "btn btn-light publish-draft" do %>
<%= image_tag 'icon_small/publish.svg' %>
<%= t('protocols.index.versions.publish') %>
<% end %>
<div data-url="<%= destroy_draft_protocol_path(@protocol.draft) %>" class="btn btn-light delete-draft">
<div data-url="<%= destroy_draft_protocol_path(draft) %>" class="btn btn-light delete-draft">
<i class="fas fa-trash"></i>
</div>
<% end %>
</div>
<div class="protocol-version-comment">
<% if can_manage_protocol_in_repository?(@protocol.draft) %>
<% if can_manage_protocol_in_repository?(draft) %>
<div
class="protocol-comment-container inline-init-handler"
data-field-to-update="version_comment"
data-params-group="protocol"
data-path-to-update="<%= update_version_comment_protocol_path(@protocol.draft) %>"
data-original-name="<%= @protocol.draft.version_comment %>"
data-path-to-update="<%= update_version_comment_protocol_path(draft) %>"
data-original-name="<%= draft.version_comment %>"
data-response-field="version_comment"
data-edit-mode="0"
>
<div class="protocol-comment-message">
<div class="view-mode" data-placeholder="<%= t('protocols.index.versions.comment_placeholder') %>"><%= @protocol.draft.version_comment %></div>
<%= text_area_tag 'version_comment', @protocol.draft.version_comment, disabled: true, class: 'smart-text-area hidden' %>
<div class="view-mode" data-placeholder="<%= t('protocols.index.versions.comment_placeholder') %>"><%= draft.version_comment %></div>
<%= text_area_tag 'version_comment', draft.version_comment, disabled: true, class: 'smart-text-area hidden' %>
</div>
<div class="edit-buttons">
<span class="cancel-button btn btn-secondary"><%= t('general.cancel') %></span>
@ -52,7 +57,7 @@
</div>
</div>
<% else %>
<%= @protocol.draft.version_comment %>
<%= draft.version_comment %>
<% end %>
</div>
</div>

1
config/locales/en.yml
View file

@ -2823,6 +2823,7 @@ en:
row_in_repository_private: "%{protocol} - <i>into My protocols</i>"
versions:
title: "%{protocol} versions"
first_draft_html: "<b>Draft</b>"
draft_html: "<b>Draft</b> (from Version %{parent_version})"
draft_modification_info: "Last modified: %{modified_on}, by %{modified_by}"
revision: "Version %{version}"