scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 09:13:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix issues related to incorrect protocol template id/code [SCI-10299]

Browse source
This commit is contained in:
sboursen-scinote 2024-02-28 15:40:09 +01:00
parent 11270a6d2e
commit f2d30db92f
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/javascript/vue/protocols/table.vue
View file

@ -114,7 +114,7 @@ export default {
cellRenderer: this.nameRenderer cellRenderer: this.nameRenderer
}, },
{ {
field: 'code', field: 'original_code',
headerName: this.i18n.t('protocols.index.thead.id'), headerName: this.i18n.t('protocols.index.thead.id'),
sortable: true sortable: true
}, },

6
app/serializers/lists/protocol_serializer.rb
View file

@ -5,7 +5,7 @@ module Lists
include Canaid::Helpers::PermissionsHelper include Canaid::Helpers::PermissionsHelper
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
attributes :name, :code, :keywords, :linked_tasks, :nr_of_versions, :assigned_users, :published_by, attributes :name, :original_code, :keywords, :linked_tasks, :nr_of_versions, :assigned_users, :published_by,
:published_on, :updated_at, :archived_by, :archived_on, :urls, :default_public_user_role_id, :published_on, :updated_at, :archived_by, :archived_on, :urls, :default_public_user_role_id,
:hidden, :top_level_assignable, :has_draft, :team :hidden, :top_level_assignable, :has_draft, :team
@ -86,8 +86,8 @@ module Lists
end end
if has_draft if has_draft
object.initial_draft? ? object : object.draft draft = object.initial_draft? ? object : object.draft || object.parent.draft
urls_list[:show_draft] = protocol_path(object) urls_list[:show_draft] = protocol_path(draft)
end end
if can_manage_protocol_users?(object) if can_manage_protocol_users?(object)