Merge pull request #1214 from ZmagoD/zd_SCI_2410

disable buttons on new/edit repository_item action [fixes SCI-2410]
This commit is contained in:
Zmago Devetak 2018-06-18 13:03:11 +02:00 committed by GitHub
commit cb7023c18e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions

View file

@ -835,6 +835,9 @@ var RepositoryDatatable = (function(global) {
if (currentMode === 'viewMode') { if (currentMode === 'viewMode') {
$('#addRepositoryRecord').removeClass('disabled'); $('#addRepositoryRecord').removeClass('disabled');
$('#addRepositoryRecord').prop('disabled', false); $('#addRepositoryRecord').prop('disabled', false);
$('.dataTables_length select').prop('disabled', false);
$('#repository-acitons-dropdown').removeClass('disabled');
$('#repository-acitons-dropdown').prop('disabled', false);
$('#addNewColumn').removeClass('disabled'); $('#addNewColumn').removeClass('disabled');
$('#addNewColumn').prop('disabled', false); $('#addNewColumn').prop('disabled', false);
$('#repository-columns-dropdown') $('#repository-columns-dropdown')
@ -891,6 +894,9 @@ var RepositoryDatatable = (function(global) {
$('#unassignRepositoryRecords').prop('disabled', false); $('#unassignRepositoryRecords').prop('disabled', false);
} }
} else if (currentMode === 'editMode') { } else if (currentMode === 'editMode') {
$('#repository-acitons-dropdown').addClass('disabled');
$('#repository-acitons-dropdown').prop('disabled', true);
$('.dataTables_length select').prop('disabled', true);
$('#addRepositoryRecord').addClass('disabled'); $('#addRepositoryRecord').addClass('disabled');
$('#addRepositoryRecord').prop('disabled', true); $('#addRepositoryRecord').prop('disabled', true);
$('#editRepositoryRecord').addClass('disabled'); $('#editRepositoryRecord').addClass('disabled');

View file

@ -15,9 +15,9 @@
</button> </button>
<% end %> <% end %>
<div class="repository-cog"> <div class="repository-cog dropdown">
<div class="dropdown"> <button id="repository-acitons-dropdown"
<div class="btn btn-default" class="btn btn-default"
type="button" type="button"
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
@ -26,7 +26,7 @@
<span class="fas fa-ellipsis-v"></span> <span class="fas fa-ellipsis-v"></span>
<span class="hidden-xs"><%= t('repositories.index.advanced') %></span> <span class="hidden-xs"><%= t('repositories.index.advanced') %></span>
<span class="caret"></span> <span class="caret"></span>
</div> </button>
<% if can_perform_repository_actions(@repository) %> <% if can_perform_repository_actions(@repository) %>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
@ -81,7 +81,6 @@
</ul> </ul>
<% end %> <% end %>
</div> </div>
</div>
<div id="datatables-buttons" style="display: inline;"> <div id="datatables-buttons" style="display: inline;">