scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-11 17:36:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes new sample group/type link in sample row [fixes SCI-796]

Browse source
This commit is contained in:
zmagod 2016-12-14 15:23:30 +01:00
parent c4ff12be51
commit b07f9fae59
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/samples/sample_datatable.js
View file

@ -749,7 +749,9 @@ function createSampleTypeSelect(data, selected) {
var $selectType = $('<select></select>') var $selectType = $('<select></select>')
.attr('name', 'sample_type_id').addClass('show-tick'); .attr('name', 'sample_type_id').addClass('show-tick');
var $option = $("<option href='/organizations/1/sample_types'></option>") var sampleTypesLink = $('#samples').attr('data-sample-types-link');
var $option = $("<option href='" + sampleTypesLink + "'></option>")
.attr('value', -2) .attr('value', -2)
.text(I18n.t('samples.table.add_sample_type')); .text(I18n.t('samples.table.add_sample_type'));
$selectType.append($option); $selectType.append($option);
@ -777,7 +779,9 @@ function createSampleGroupSelect(data, selected) {
var $selectGroup = $('<select></select>') var $selectGroup = $('<select></select>')
.attr('name', 'sample_group_id').addClass('show-tick'); .attr('name', 'sample_group_id').addClass('show-tick');
var $option = $("<option href='/organizations/1/sample_groups'></option>") var sampleGroupsLink = $('#samples').attr('data-sample-groups-link');
var $option = $("<option href='" + sampleGroupsLink + "'></option>")
.text(I18n.t('samples.table.add_sample_group')); .text(I18n.t('samples.table.add_sample_group'));
$selectGroup.append($option); $selectGroup.append($option);
$option = $('<option></option>') $option = $('<option></option>')

8
app/views/shared/_samples.html.erb
View file

@ -129,6 +129,14 @@
data-num-columns="<%= num_of_columns %>" data-num-columns="<%= num_of_columns %>"
data-new-sample="<%= new_organization_sample_path(organization_id: @organization) %>" data-new-sample="<%= new_organization_sample_path(organization_id: @organization) %>"
data-create-sample="<%= organization_samples_path(organization_id: @organization) %>" data-create-sample="<%= organization_samples_path(organization_id: @organization) %>"
data-sample-types-link="<%= organization_sample_types_path(@organization,
project_id: (@project.id if @project),
my_module_id: (@my_module.id if @my_module),
experiment_id: (@experiment.id if @experiment)) %>"
data-sample-groups-link="<%= organization_sample_groups_path(current_organization,
project_id: (@project.id if @project),
my_module_id: (@my_module.id if @my_module),
experiment_id: (@experiment.id if @experiment)) %>"
> >
<thead> <thead>
<tr> <tr>