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

Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701]

Browse source
This commit is contained in:
Matej Zrimšek 2016-12-09 17:22:09 +01:00
parent 0b12c87b09
commit 54de13de82
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -759,7 +759,7 @@ function createSampleTypeSelect(data, selected) {
.attr('value', val.id).text(val.name); .attr('value', val.id).text(val.name);
$selectType.append($option); $selectType.append($option);
}); });
$selectType.makeDropdownOptionsLinks(selected); $selectType.makeDropdownOptionsLinks(selected, 'add-mode');
return $selectType; return $selectType;
} }
@ -791,7 +791,7 @@ function createSampleGroupSelect(data, selected) {
$selectGroup.append($option); $selectGroup.append($option);
}); });
$selectGroup.makeDropdownOptionsLinks(selected); $selectGroup.makeDropdownOptionsLinks(selected, 'add-mode');
return $selectGroup; return $selectGroup;
} }

12
app/assets/javascripts/samples/sample_types_groups.js
View file

@ -4,6 +4,7 @@
function showNewSampleTypeGroupForm() { function showNewSampleTypeGroupForm() {
$('#create-resource').on('click', function() { $('#create-resource').on('click', function() {
$('.new-resource-form').slideDown(); $('.new-resource-form').slideDown();
$('#name-input').focus();
}); });
} }
@ -211,6 +212,16 @@
}); });
} }
/**
* Opens adding mode when redirected from samples page, when clicking link for
* adding sample type or group link
*/
function sampleTypeGroupEditMode() {
if (getParam('add-mode')) {
$('#create-resource').click();
}
}
function initSampleTypesGroups() { function initSampleTypesGroups() {
showNewSampleTypeGroupForm(); showNewSampleTypeGroupForm();
newSampleTypeFormCancel(); newSampleTypeFormCancel();
@ -223,6 +234,7 @@
initSampleGroupColor(); initSampleGroupColor();
bindNewSampleGroupAction(); bindNewSampleGroupAction();
appendCarretToColorPickerDropdown(); appendCarretToColorPickerDropdown();
sampleTypeGroupEditMode();
} }
// initialize sample types/groups actions // initialize sample types/groups actions

6
app/assets/javascripts/sitewide/utils.js
View file

@ -221,13 +221,15 @@ function initPageTutorialSteps(pageFirstStepN, pageLastStepN, nextPagePath,
* attribute yourself, and the dropdown elments which don't have them, will get * attribute yourself, and the dropdown elments which don't have them, will get
* '#' by default. * '#' by default.
* @param {number} selectedIdx Index of element to be selected * @param {number} selectedIdx Index of element to be selected
* @param {string} urlParam URL parameter to pass to the link URLs
* @return {Object} This * @return {Object} This
*/ */
$.fn.makeDropdownOptionsLinks = function(selectedIdx) { $.fn.makeDropdownOptionsLinks = function(selectedIdx, urlParam) {
selectedIdx = _.isUndefined(selectedIdx) ? 1 : selectedIdx; selectedIdx = _.isUndefined(selectedIdx) ? 1 : selectedIdx;
$(this).change(function() { $(this).change(function() {
location = $(this).find('option:selected').attr('href'); window.location.href = addParam($(this).find('option:selected')
.attr('href'), urlParam);
}); });
$(this).find('option') $(this).find('option')