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

Fix merge

Browse source
This commit is contained in:
aignatov-bio 2019-10-22 11:18:31 +02:00 • committed by Urban Rotnik
parent 9eec36cb01
commit 308c1c93d0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/repository_columns/index.js
View file

@ -45,7 +45,7 @@ var RepositoryColumns = (function() {
var html = `<li class="list-group-item row" data-id="${column.id}"> var html = `<li class="list-group-item row" data-id="${column.id}">
<div class="col-xs-8"> <div class="col-xs-8">
<span class="pull-left column-name">${column.name}</span> <span class="pull-left column-name">${column.attributes.name}</span>
</div> </div>
<div class="col-xs-4"> <div class="col-xs-4">
<span class="controlls pull-right"> <span class="controlls pull-right">
@ -54,14 +54,14 @@ var RepositoryColumns = (function() {
data-modal-url="${column.destroy_html_url}" data-modal-url="${column.destroy_html_url}"
> >
<span class="fas fa-pencil-alt"></span> <span class="fas fa-pencil-alt"></span>
<%= I18n.t "libraries.repository_columns.index.edit_column" %> ${ I18n.t('libraries.repository_columns.index.edit_column')}
</button> </button>
<button class="btn btn-default delete-repo-column" <button class="btn btn-default delete-repo-column"
data-action="destroy" data-action="destroy"
data-modal-url="${column.destroy_html_url}" data-modal-url="${column.destroy_html_url}"
> >
<span class="fas fa-trash-alt"></span> <span class="fas fa-trash-alt"></span>
<%= I18n.t "libraries.repository_columns.index.delete_column" %> ${ I18n.t('libraries.repository_columns.index.delete_column')}
</button> </button>
</span> </span>
</div> </div>
@ -79,13 +79,13 @@ var RepositoryColumns = (function() {
$manageModal.off('click', '#new-repo-column-submit').on('click', '#new-repo-column-submit', function() { $manageModal.off('click', '#new-repo-column-submit').on('click', '#new-repo-column-submit', function() {
var url = $('#repository-column-data-type').find(':selected').data('create-url'); var url = $('#repository-column-data-type').find(':selected').data('create-url');
var params = { repository_column: { name: $('#repository-column-name').val() } }; var params = { repository_column: { name: $('#repository-column-name').val() } };
$.post(url, params, (data) => { $.post(url, params, (result) => {
insertNewListItem(data); insertNewListItem(result.data);
HelperModule.flashAlertMsg(data.message, 'success'); HelperModule.flashAlertMsg(result.data.message, 'success');
$manageModal.modal('hide'); $manageModal.modal('hide');
}).error((error) => { }).error((error) => {
$('#new_repository_column').renderFormErrors('repository_column', error.responseJSON.repository_column, true); $('#new_repository_column').renderFormErrors('repository_column', error.responseJSON.repository_column, true);
}) });
}); });
} }