View | Details | Raw Unified | Return to bug 23590
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-14 / +30 lines)
Lines 393-399 Link Here
393
            <li>
393
            <li>
394
                <label for="managedby_name">by:</label>
394
                <label for="managedby_name">by:</label>
395
                <div>
395
                <div>
396
                    <span id="managedby_name">
396
                    <span id="managedby_name" name="managedby_name">
397
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
397
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
398
                    </span>
398
                    </span>
399
                    [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %]
399
                    [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %]
Lines 679-687 Link Here
679
            <div class="col-sm-2">
679
            <div class="col-sm-2">
680
                <fieldset>
680
                <fieldset>
681
                    <label for="set_manager_[% loop.count %]">Update manager</label><br/>
681
                    <label for="set_manager_[% loop.count %]">Update manager</label><br/>
682
                    <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a>
682
                    <a id="set_manager_[% loop.count %]" data-tab="[% loop.count %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a>
683
                    <span id="managedby_name"></span>
683
                    <span id="managedby_name[% loop.count %]"></span>
684
                    <input type="hidden" name="suggestion_managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
684
                    <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count %]" value="[% logged_in_user.borrowernumber | html %]" />
685
                    <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
685
                    <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
686
                    <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_manager"/>Submit</button></fieldset>
686
                    <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_manager"/>Submit</button></fieldset>
687
                </fieldset>
687
                </fieldset>
Lines 756-763 Link Here
756
                </fieldset>
756
                </fieldset>
757
				 <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
757
				 <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
758
                    <ol>
758
                    <ol>
759
                        <li>
760
                            <label for="archived" style="display: inline;">Include archived:</label>
761
                            <input type="checkbox" id="archived" name="filter_archived" value="archived" title="Include archived suggestions in the search" />
762
                      </li>
759
                      <li>
763
                      <li>
760
                          <label for="STATUS"> Status:</label>
764
                          <label for="STATUS"> Status:</label>
765
761
                          <select name="STATUS" id="STATUS">
766
                          <select name="STATUS" id="STATUS">
762
                              <option value="">Any</option>
767
                              <option value="">Any</option>
763
768
Lines 870-876 Link Here
870
    [% INCLUDE 'calendar.inc' %]
875
    [% INCLUDE 'calendar.inc' %]
871
876
872
    <script type="text/javascript">
877
    <script type="text/javascript">
873
        function editManagerPopup() {
878
        var tab = '';
879
        function editManagerPopup(selected_tab) {
880
            tab = selected_tab;
874
            window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select",
881
            window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select",
875
                'PatronPopup',
882
                'PatronPopup',
876
                'width=740,height=450,location=yes,toolbar=no,'
883
                'width=740,height=450,location=yes,toolbar=no,'
Lines 878-892 Link Here
878
            );
885
            );
879
        }
886
        }
880
        function select_user(borrowernumber, borrower) {
887
        function select_user(borrowernumber, borrower) {
881
            $("#managedby_name").empty();
888
            var managedby_name = $("#managedby_name"+tab);
882
            $("#managedby").val('');
889
            var managedby = $("#managedby"+tab);
890
            managedby_name.empty();
891
            managedby.val('');
883
            var borrowername = borrower.firstname + ' ' + borrower.surname;
892
            var borrowername = borrower.firstname + ' ' + borrower.surname;
884
            if (borrowernumber) {
893
            if (borrowernumber) {
885
                var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
894
                var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
886
                    + '?borrowernumber=' + borrowernumber + '">'
895
                    + '?borrowernumber=' + borrowernumber + '">'
887
                    + borrowername + '</a>';
896
                    + borrowername + '</a>';
888
                $('#managedby_name').html(managerlink);
897
                managedby_name.html(managerlink);
889
                $('#managedby').val(borrowernumber);
898
                managedby.val(borrowernumber);
890
            }
899
            }
891
900
892
            [% IF op == "save" %]
901
            [% IF op == "save" %]
Lines 904-911 Link Here
904
        $(document).ready(function(){
913
        $(document).ready(function(){
905
            $("#edit_manager").on("click",function(e){
914
            $("#edit_manager").on("click",function(e){
906
                e.preventDefault();
915
                e.preventDefault();
907
                editManagerPopup();
916
                editManagerPopup('');
908
            });
917
            });
918
            $(".set_manager").on("click",function(e){
919
                e.preventDefault();
920
                var selected_tab = $(this).data('tab');
921
                editManagerPopup(selected_tab);
922
            });
923
909
        });
924
        });
910
    </script>
925
    </script>
911
926
Lines 1006-1013 Link Here
1006
                });
1021
                });
1007
1022
1008
                $("button[type='submit']").on("click", function(e) {
1023
                $("button[type='submit']").on("click", function(e) {
1009
                    var form = $(this).parents("form");
1024
                    var submit_button = this;
1010
                    var action = $(this).val();
1025
                    var form = $(submit_button).parents("form");
1026
                    var action = $(submit_button).val();
1011
                    var selected_suggestions = $(form).find("input[name='suggestionid']:checked");
1027
                    var selected_suggestions = $(form).find("input[name='suggestionid']:checked");
1012
                    if ( selected_suggestions.length == 0 ) {
1028
                    if ( selected_suggestions.length == 0 ) {
1013
                        alert(_("Please select at least one suggestion"));
1029
                        alert(_("Please select at least one suggestion"));
Lines 1027-1033 Link Here
1027
                            }
1043
                            }
1028
                        }
1044
                        }
1029
                    } else if ( action == "update_manager" ) {
1045
                    } else if ( action == "update_manager" ) {
1030
                        if ( $("#managedby").val() == "" ) {
1046
                        var managedby = $(submit_button).siblings("suggestion_managedby");
1047
                        if ( managedby.val() == "" ) {
1031
                            alert(_("Please select a manager to assign to the selected suggestions"));
1048
                            alert(_("Please select a manager to assign to the selected suggestions"));
1032
                            e.preventDefault();
1049
                            e.preventDefault();
1033
                            return false;
1050
                            return false;
1034
- 

Return to bug 23590