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 394-400 Link Here
394
            <li>
394
            <li>
395
                <label for="managedby_name">by:</label>
395
                <label for="managedby_name">by:</label>
396
                <div>
396
                <div>
397
                    <span id="managedby_name">
397
                    <span id="managedby_name" name="managedby_name">
398
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
398
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a>
399
                    </span>
399
                    </span>
400
                    [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %]
400
                    [% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %]
Lines 689-697 Link Here
689
            <div class="col-sm-2">
689
            <div class="col-sm-2">
690
                <fieldset>
690
                <fieldset>
691
                    <label for="set_manager_[% loop.count %]">Update manager</label><br/>
691
                    <label for="set_manager_[% loop.count %]">Update manager</label><br/>
692
                    <a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a>
692
                    <a id="set_manager_[% loop.count %]" data-tab="[% loop.count %]" class="set_manager" href="#"><i class="fa fa-search"></i> Select manager</a>
693
                    <span id="managedby_name"></span>
693
                    <span id="managedby_name[% loop.count %]"></span>
694
                    <input type="hidden" name="suggestion_managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" />
694
                    <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count %]" value="[% logged_in_user.borrowernumber | html %]" />
695
                    <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
695
                    <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
696
                    <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_manager"/>Submit</button></fieldset>
696
                    <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_manager"/>Submit</button></fieldset>
697
                </fieldset>
697
                </fieldset>
Lines 766-773 Link Here
766
                </fieldset>
766
                </fieldset>
767
				 <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
767
				 <fieldset class="brief"><h4 class="local_collapse"><a href="#">Suggestion information</a></h4>
768
                    <ol>
768
                    <ol>
769
                        <li>
770
                            <label for="archived" style="display: inline;">Include archived:</label>
771
                            <input type="checkbox" id="archived" name="filter_archived" value="archived" title="Include archived suggestions in the search" />
772
                      </li>
769
                      <li>
773
                      <li>
770
                          <label for="STATUS"> Status:</label>
774
                          <label for="STATUS"> Status:</label>
775
771
                          <select name="STATUS" id="STATUS">
776
                          <select name="STATUS" id="STATUS">
772
                              <option value="">Any</option>
777
                              <option value="">Any</option>
773
778
Lines 880-886 Link Here
880
    [% INCLUDE 'calendar.inc' %]
885
    [% INCLUDE 'calendar.inc' %]
881
886
882
    <script type="text/javascript">
887
    <script type="text/javascript">
883
        function editManagerPopup() {
888
        var tab = '';
889
        function editManagerPopup(selected_tab) {
890
            tab = selected_tab;
884
            window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select",
891
            window.open("/cgi-bin/koha/suggestion/add_user_search.pl?selection_type=select",
885
                'PatronPopup',
892
                'PatronPopup',
886
                'width=740,height=450,location=yes,toolbar=no,'
893
                'width=740,height=450,location=yes,toolbar=no,'
Lines 888-902 Link Here
888
            );
895
            );
889
        }
896
        }
890
        function select_user(borrowernumber, borrower) {
897
        function select_user(borrowernumber, borrower) {
891
            $("#managedby_name").empty();
898
            var managedby_name = $("#managedby_name"+tab);
892
            $("#managedby").val('');
899
            var managedby = $("#managedby"+tab);
900
            managedby_name.empty();
901
            managedby.val('');
893
            var borrowername = borrower.firstname + ' ' + borrower.surname;
902
            var borrowername = borrower.firstname + ' ' + borrower.surname;
894
            if (borrowernumber) {
903
            if (borrowernumber) {
895
                var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
904
                var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
896
                    + '?borrowernumber=' + borrowernumber + '">'
905
                    + '?borrowernumber=' + borrowernumber + '">'
897
                    + borrowername + '</a>';
906
                    + borrowername + '</a>';
898
                $('#managedby_name').html(managerlink);
907
                managedby_name.html(managerlink);
899
                $('#managedby').val(borrowernumber);
908
                managedby.val(borrowernumber);
900
            }
909
            }
901
910
902
            [% IF op == "save" %]
911
            [% IF op == "save" %]
Lines 914-921 Link Here
914
        $(document).ready(function(){
923
        $(document).ready(function(){
915
            $("#edit_manager").on("click",function(e){
924
            $("#edit_manager").on("click",function(e){
916
                e.preventDefault();
925
                e.preventDefault();
917
                editManagerPopup();
926
                editManagerPopup('');
918
            });
927
            });
928
            $(".set_manager").on("click",function(e){
929
                e.preventDefault();
930
                var selected_tab = $(this).data('tab');
931
                editManagerPopup(selected_tab);
932
            });
933
919
        });
934
        });
920
    </script>
935
    </script>
921
936
Lines 1020-1027 Link Here
1020
                });
1035
                });
1021
1036
1022
                $("button[type='submit']").on("click", function(e) {
1037
                $("button[type='submit']").on("click", function(e) {
1023
                    var form = $(this).parents("form");
1038
                    var submit_button = this;
1024
                    var action = $(this).val();
1039
                    var form = $(submit_button).parents("form");
1040
                    var action = $(submit_button).val();
1025
                    var selected_suggestions = $(form).find("input[name='suggestionid']:checked");
1041
                    var selected_suggestions = $(form).find("input[name='suggestionid']:checked");
1026
                    if ( selected_suggestions.length == 0 ) {
1042
                    if ( selected_suggestions.length == 0 ) {
1027
                        alert(_("Please select at least one suggestion"));
1043
                        alert(_("Please select at least one suggestion"));
Lines 1041-1047 Link Here
1041
                            }
1057
                            }
1042
                        }
1058
                        }
1043
                    } else if ( action == "update_manager" ) {
1059
                    } else if ( action == "update_manager" ) {
1044
                        if ( $("#managedby").val() == "" ) {
1060
                        var managedby = $(submit_button).siblings("suggestion_managedby");
1061
                        if ( managedby.val() == "" ) {
1045
                            alert(_("Please select a manager to assign to the selected suggestions"));
1062
                            alert(_("Please select a manager to assign to the selected suggestions"));
1046
                            e.preventDefault();
1063
                            e.preventDefault();
1047
                            return false;
1064
                            return false;
1048
- 

Return to bug 23590