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

Moved export form to proper place in the code. [SCI-1275]

Browse source
This commit is contained in:
Matej Zrimšek 2017-06-09 19:00:15 +02:00
parent f46d8f6970
commit 29b721365a
3 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/repositories/repository_datatable.js
View file

@ -712,8 +712,7 @@ function updateButtons() {
$('#exportRepositoriesButton').removeClass('disabled');
$('#exportRepositoriesButton').prop('disabled', false);
$('#exportRepositoriesButton').on('click', function() {
$('#exportRepositoryModal')
.modal('show')
$('#exportRepositoryModal').modal('show');
});
$('#export-repositories').on('click', function() {
animateSpinner(null, true);

29
app/views/repositories/_export_repository_modal.html.erb
View file

@ -3,19 +3,22 @@
tabindex="-1"
role="dialog"
aria-labelledby="modal-export-repository-label">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%=t 'zip_export.modal_label' %></h4>
</div>
<div class="modal-body">
<%=t('zip_export.repository_html', repository: repository.name) %>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-primary' data-dismiss='modal' id='export-repositories'> <%=t 'my_modules.repository.export' %> </button>
<button type='button' class='btn btn-default' data-dismiss='modal' id='close-modal-export-repositories'><%= t('general.close')%></button>
<%= bootstrap_form_tag(url: export_repository_team_path(repository),
html: { id: 'form-export' }) do |f| %>
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%=t 'zip_export.modal_label' %></h4>
</div>
<div class="modal-body">
<%=t('zip_export.repository_html', repository: repository.name) %>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-primary' data-dismiss='modal' id='export-repositories'> <%=t 'my_modules.repository.export' %> </button>
<button type='button' class='btn btn-default' data-dismiss='modal' id='close-modal-export-repositories'><%= t('general.close')%></button>
</div>
</div>
</div>
</div>
<% end %>
</div>

7
app/views/repositories/_repository.html.erb
View file

@ -5,12 +5,6 @@
<div id="alert-container"></div>
<% if can_view_repository(repository) %>
<%= bootstrap_form_tag(url: export_repository_team_path(repository),
html: { id: 'form-export', class: 'hidden' }) do |f| %>
<% end %>
<% end %>
<div id="repository-toolbar">
<% if can_create_repository_records(repository) %>
@ -88,4 +82,3 @@
repository_index_link: repository_table_index_path(repository)
}
%>