139 '</table>'; |
147 '</table>'; |
140 tab.append($(html)); |
148 tab.append($(html)); |
141 |
149 |
142 $("#c_filter input[type='text']").add("#c_filter select").addClass('c_filter_field') ; |
150 $("#c_filter input[type='text']").add("#c_filter select").addClass('c_filter_field') ; |
143 |
151 |
144 $("#filter_name").add("#filter_date").add("#filter_tag").add("#filter_state").change(function() { |
152 $("#filter_name").add("#filter_date").add("#filter_tag").add("#filter_cat").add("#filter_state").change(function() { |
145 if (frames['text_view_comments'].readyForAction()) { |
153 if (frames['text_view_comments'].readyForAction()) { |
146 var elt = $(this) ; |
154 var elt = $(this) ; |
147 frames['text_view_comments'].checkForOpenedDialog(null, function() { |
155 frames['text_view_comments'].checkForOpenedDialog(null, function() { |
148 //console.info($(this)) ; |
156 //console.info($(this)) ; |
149 //console.info(elt) ; |
157 //console.info(elt) ; |
544 f_getFrameFilterData = function () { |
552 f_getFrameFilterData = function () { |
545 var name = $('#filter_name').val(); ; |
553 var name = $('#filter_name').val(); ; |
546 var date_str = $('#filter_date').val(); ; |
554 var date_str = $('#filter_date').val(); ; |
547 var text = $('#filter_text').val(); ; |
555 var text = $('#filter_text').val(); ; |
548 var tag = $('#filter_tag').val(); ; |
556 var tag = $('#filter_tag').val(); ; |
|
557 var cat = $('#filter_cat').val(); ; |
549 var state = $('#filter_state').val(); ; |
558 var state = $('#filter_state').val(); ; |
550 return {'name':name, 'date':date_str, 'text':text, 'tag':tag, 'state':state} ; |
559 return {'name':name, 'date':date_str, 'text':text, 'tag':tag, 'cat':cat, 'state':state} ; |
551 } |
560 } |
552 |
561 |
553 f_setFilterValue = function (obj) { |
562 f_setFilterValue = function (obj) { |
554 for (key in obj) { |
563 for (key in obj) { |
555 if (key.indexOf('filter_') == 0) |
564 if (key.indexOf('filter_') == 0) |
655 for (var i=0, ilen=newFilterData['tags'].length; i < ilen ; i++) { |
664 for (var i=0, ilen=newFilterData['tags'].length; i < ilen ; i++) { |
656 var item = newFilterData['tags'][i] ; |
665 var item = newFilterData['tags'][i] ; |
657 $("#filter_tag").append($("<option name='c_f2_tag_"+ item.name +"' value='"+ item.name +"'>" + item.name +" ("+item.nb_comments+")</option>")) ; |
666 $("#filter_tag").append($("<option name='c_f2_tag_"+ item.name +"' value='"+ item.name +"'>" + item.name +" ("+item.nb_comments+")</option>")) ; |
658 } |
667 } |
659 $("#filter_tag option[name="+selectedTagOption+"]").attr("selected", true); |
668 $("#filter_tag option[name="+selectedTagOption+"]").attr("selected", true); |
|
669 |
|
670 // categories |
|
671 var selectedCatOption = $("#filter_cat option:selected").attr("cat") ; |
|
672 |
|
673 $("#filter_cat option").remove() ; |
|
674 |
|
675 categories = frames['text_view_comments'].CY.JSON.parse(frames['text_view_comments'].sv_categories); |
|
676 if (categories.hasOwnProperty('0')) { |
|
677 $("#filter_cat").append($("<option name='c_f2_cat_all' value=''>" + all + "</option>")) ; |
|
678 for (var i=0, ilen=newFilterData['categories'].length; i < ilen ; i++) { |
|
679 var item = newFilterData['categories'][i] ; |
|
680 $("#filter_cat").append($("<option name='c_f2_cat_"+ item.cat +"' value='"+ gettext(item.cat) +"'>" + categories[item.cat] +" ("+item.nb_comments+")</option>")) ; |
|
681 } |
|
682 $("#filter_cat option[name="+selectedCatOption+"]").attr("selected", true); |
|
683 } |
|
684 else { |
|
685 $("#filter_cat").remove() |
|
686 $("#filter_cat_label").remove() |
|
687 } |
660 |
688 |
661 // states |
689 // states |
662 var selectedStateOption = $("#filter_state option:selected").attr("state") ; |
690 var selectedStateOption = $("#filter_state option:selected").attr("state") ; |
663 |
691 |
664 $("#filter_state option").remove() ; |
692 $("#filter_state option").remove() ; |