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

Fix markup

Browse source
This commit is contained in:
aignatov-bio 2019-12-11 15:08:18 +01:00
parent 52c0782447
commit eed56b59aa
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/repositories/renderers/view_renderers.js
View file

@ -1,3 +1,5 @@
/* global I18n */
$.fn.dataTable.render.RepositoryAssetValue = function(data) {
var asset = data.value;
return `
@ -99,15 +101,16 @@ $.fn.dataTable.render.RepositoryDateRangeValue = function(data) {
$.fn.dataTable.render.RepositoryChecklistValue = function(data) {
var render = '—';
var options = data.value;
if (options.length == 1) {
var optionsList;
if (options.length === 1) {
render = `<span class="checklist-options" data-checklist-items='${JSON.stringify(options)}'>
${options[0].label}
</span>`
</span>`;
} else if (options.length > 1) {
var optionsList = $(' <ul class="dropdown-menu checklist-dropdown-menu" role="menu"></ul');
optionsList = $(' <ul class="dropdown-menu checklist-dropdown-menu" role="menu"></ul');
$.each(options, function(i, option) {
$(`<li class="checklist-item">${option.label}</li>`).appendTo(optionsList)
})
$(`<li class="checklist-item">${option.label}</li>`).appendTo(optionsList);
});
render = `
<span class="dropdown checklist-dropdown">
@ -115,7 +118,7 @@ $.fn.dataTable.render.RepositoryChecklistValue = function(data) {
${options.length} ${I18n.t('libraries.manange_modal_column.checklist_type.multiple_options')}
</span>
${optionsList[0].outerHTML}
</span>`
</span>`;
}
return render;
};

2
app/assets/javascripts/repositories/validators/base_validator.js
View file

@ -32,4 +32,4 @@ $.fn.dataTable.render.RepositoryAssetValueValidator = function($input) {
$.fn.dataTable.render.RepositoryChecklistValueValidator = function() {
return true;
};
};

8
app/controllers/repository_columns/list_columns_controller.rb
View file

@ -47,10 +47,10 @@ module RepositoryColumns
def items
column_list_items = @repository_column.repository_list_items
.where('data ILIKE ?',
"%#{search_params[:query]}%")
.limit(Constants::SEARCH_LIMIT)
.select(:id, :data)
.where('data ILIKE ?',
"%#{search_params[:query]}%")
.limit(Constants::SEARCH_LIMIT)
.select(:id, :data)
render json: column_list_items.map { |i| { value: i.id, label: escape_input(i.data) } }, status: :ok
end