kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix #849

Browse Source
This commit is contained in:
James Cole
2017-10-26 19:57:41 +02:00
parent 78584c7128
commit 94762847a2
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/ff/search/index.js vendored
View File

@@ -29,7 +29,6 @@ $(function () {
});
function startSearch(query) {
$.post(searchUri, {query: query}).done(presentSearchResults).fail(searchFailure);
}
@@ -44,4 +43,8 @@ function presentSearchResults(data) {
$('span.search_count').text(data.count);
$('.search_box').find('.overlay').remove();
$('.search_results').html(data.html).show();
$('.select_all_single').unbind('change').change(function () {
countChecked();
});
}

3
public/js/ff/transactions/list.js vendored
View File

@@ -36,7 +36,7 @@ $(document).ready(function () {
countChecked();
}
});
$('.select_all_single').change(function () {
$('.select_all_single').unbind('change').change(function () {
countChecked();
});
@@ -147,7 +147,6 @@ function stopMassSelect() {
function startMassSelect() {
"use strict";
// show "select all" box in table header.
$('.select_boxes').show();

22
resources/views/search/index.twig
View File

@@ -53,11 +53,27 @@
<div class="overlay">
<i class="fa fa-refresh fa-spin"></i>
</div>
<div class="row mass_edit_all hidden-xs" style="display: none;">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="mass_button_options btn-group btn-group" style="display:none;">
<a href="#" class="btn btn-default mass_edit"><i class="fa fa-fw fa-pencil"></i> <span>{{ 'edit_selected'|_ }}</span></a>
<a href="#" class="btn btn-danger mass_delete"><i class="fa fa-fw fa-trash"></i> <span>{{ 'delete_selected'|_ }}</span></a>
</div>
</div>
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 hidden-xs">
<div class="mass_buttons btn-group btn-group pull-right">
<a href="#" class="btn btn-default mass_select"><i class="fa fa-fw fa-check-square-o"></i> {{ 'select_transactions'|_ }}</a>
<a href="#" class="btn btn-default mass_stop_select" style="display:none;"><i class="fa faw-fw fa-square-o"
></i> {{ 'stop_selection'|_ }}</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row error_row" style="display:none; ">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-danger">
@@ -85,13 +101,17 @@
</div>
</div>
</div>
</div>
{% endif %}
{% endblock %}
{% block scripts %}
<script type="text/javascript">
var edit_selected_txt = "{{ 'edit_selected'|_ }}";
var delete_selected_txt = "{{ 'delete_selected'|_ }}";
var searchQuery = "{{ fullQuery|escape('js') }}";
var searchUri = "{{ route('search.search') }}";
</script>
<script type="text/javascript" src="js/ff/search/index.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

7
resources/views/search/search.twig
View File

@@ -16,7 +16,12 @@
{% for transaction in transactions %}
<tr>
<td class="hidden-xs">
<div class="btn-group btn-group-xs">
<div class="select_single" style="display:none;">
<input name="select_all_single[]" class="select_all_single" value="{{ transaction.journal_id }}" type="checkbox"/>
</div>
<div class="btn-group btn-group-xs edit_buttons edit_tr_buttons">
<a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i
class="fa fa-fw fa-pencil"></i></a>
<a href="{{ route('transactions.delete',transaction.journal_id) }}" class="btn btn-xs btn-danger"><i