diff -r 8ec189cc214d -r b2e0186daa5b src/cm/media/js/site/f_text_view_frame.js --- a/src/cm/media/js/site/f_text_view_frame.js Wed Mar 27 17:51:18 2013 +0100 +++ b/src/cm/media/js/site/f_text_view_frame.js Tue Jun 25 11:56:01 2013 +0200 @@ -118,6 +118,14 @@ '' + '' + '' + + ' ' + + '' + + gettext('Categories') + + '' + + ' ' + + '' + + '' + + '' + '' + '' + '' + @@ -141,7 +149,7 @@ $("#c_filter input[type='text']").add("#c_filter select").addClass('c_filter_field') ; - $("#filter_name").add("#filter_date").add("#filter_tag").add("#filter_state").change(function() { + $("#filter_name").add("#filter_date").add("#filter_tag").add("#filter_cat").add("#filter_state").change(function() { if (frames['text_view_comments'].readyForAction()) { var elt = $(this) ; frames['text_view_comments'].checkForOpenedDialog(null, function() { @@ -546,8 +554,9 @@ var date_str = $('#filter_date').val(); ; var text = $('#filter_text').val(); ; var tag = $('#filter_tag').val(); ; + var cat = $('#filter_cat').val(); ; var state = $('#filter_state').val(); ; - return {'name':name, 'date':date_str, 'text':text, 'tag':tag, 'state':state} ; + return {'name':name, 'date':date_str, 'text':text, 'tag':tag, 'cat':cat, 'state':state} ; } f_setFilterValue = function (obj) { @@ -658,6 +667,25 @@ } $("#filter_tag option[name="+selectedTagOption+"]").attr("selected", true); + // categories + var selectedCatOption = $("#filter_cat option:selected").attr("cat") ; + + $("#filter_cat option").remove() ; + + categories = frames['text_view_comments'].CY.JSON.parse(frames['text_view_comments'].sv_categories); + if (categories.hasOwnProperty('0')) { + $("#filter_cat").append($("")) ; + for (var i=0, ilen=newFilterData['categories'].length; i < ilen ; i++) { + var item = newFilterData['categories'][i] ; + $("#filter_cat").append($("")) ; + } + $("#filter_cat option[name="+selectedCatOption+"]").attr("selected", true); + } + else { + $("#filter_cat").remove() + $("#filter_cat_label").remove() + } + // states var selectedStateOption = $("#filter_state option:selected").attr("state") ;