From c76406e46e71cb86cfb440667bfbbe21b36e709e Mon Sep 17 00:00:00 2001 From: hernani Date: Thu, 9 Sep 2010 15:55:47 +0000 Subject: [PATCH] Several improvements in the node bulk management feature. Improved filters and added the close action. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@584 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/forms/admin.py | 2 + forum/models/node.py | 16 ++ forum/skins/default/media/js/osqa.admin.js | 13 +- forum/skins/default/media/js/osqa.main.js | 4 +- .../default/media/style/djstyle_admin.css | 2 + .../default/templates/osqaadmin/nodeman.html | 172 +++++++++++++++++- forum/urls.py | 1 + forum/utils/pagination.py | 2 +- forum/views/admin.py | 39 +++- forum/views/commands.py | 14 +- forum_modules/pgfulltext/handlers.py | 15 ++ forum_modules/pgfulltext/pg_fts_install.sql | 1 + forum_modules/pgfulltext/startup.py | 2 +- 13 files changed, 266 insertions(+), 17 deletions(-) diff --git a/forum/forms/admin.py b/forum/forms/admin.py index 389e70e..32d710b 100644 --- a/forum/forms/admin.py +++ b/forum/forms/admin.py @@ -1,9 +1,11 @@ import socket from django import forms from django.utils.translation import ugettext as _ +from django.contrib.admin.widgets import FilteredSelectMultiple, AdminDateWidget from qanda import TitleField, EditorField from forum import settings from forum.models.node import NodeMetaClass +from forum.models import User class IPListField(forms.CharField): def clean(self, value): diff --git a/forum/models/node.py b/forum/models/node.py index 0f8f5d3..ea83e7f 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -259,6 +259,10 @@ class Node(BaseModel, NodeContent): return nis + @property + def state_list(self): + return [s.state_type for s in self.states.all()] + @property def deleted(self): return self.nis.deleted @@ -373,6 +377,18 @@ class Node(BaseModel, NodeContent): tag.add_to_usage_count(1) tag.save() + def delete(self, *args, **kwargs): + self.active_revision = None + self.save() + + for n in self.children.all(): + n.delete() + + for a in self.actions.all(): + a.cancel() + + super(Node, self).delete(*args, **kwargs) + def save(self, *args, **kwargs): tags_changed = self._process_changes_in_tags() diff --git a/forum/skins/default/media/js/osqa.admin.js b/forum/skins/default/media/js/osqa.admin.js index b7e6a1c..fb2bd0d 100644 --- a/forum/skins/default/media/js/osqa.admin.js +++ b/forum/skins/default/media/js/osqa.admin.js @@ -58,4 +58,15 @@ $(function() { $input.keyup(rewrite_anchor); rewrite_anchor(); }); -}); \ No newline at end of file +}); + +/* + * Autocomplete - jQuery plugin 1.0.2 + * Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */;(function($){$.fn.extend({autocomplete:function(urlOrData,options){var isUrl=typeof urlOrData=="string";options=$.extend({},$.Autocompleter.defaults,{url:isUrl?urlOrData:null,data:isUrl?null:urlOrData,delay:isUrl?$.Autocompleter.defaults.delay:10,max:options&&!options.scroll?10:150},options);options.highlight=options.highlight||function(value){return value;};options.formatMatch=options.formatMatch||options.formatItem;return this.each(function(){new $.Autocompleter(this,options);});},result:function(handler){return this.bind("result",handler);},search:function(handler){return this.trigger("search",[handler]);},flushCache:function(){return this.trigger("flushCache");},setOptions:function(options){return this.trigger("setOptions",[options]);},unautocomplete:function(){return this.trigger("unautocomplete");}});$.Autocompleter=function(input,options){var KEY={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8};var $input=$(input).attr("autocomplete","off").addClass(options.inputClass);var timeout;var previousValue="";var cache=$.Autocompleter.Cache(options);var hasFocus=0;var lastKeyPressCode;var config={mouseDownOnSelect:false};var select=$.Autocompleter.Select(options,input,selectCurrent,config);var blockSubmit;$.browser.opera&&$(input.form).bind("submit.autocomplete",function(){if(blockSubmit){blockSubmit=false;return false;}});$input.bind(($.browser.opera?"keypress":"keydown")+".autocomplete",function(event){lastKeyPressCode=event.keyCode;switch(event.keyCode){case KEY.UP:event.preventDefault();if(select.visible()){select.prev();}else{onChange(0,true);}break;case KEY.DOWN:event.preventDefault();if(select.visible()){select.next();}else{onChange(0,true);}break;case KEY.PAGEUP:event.preventDefault();if(select.visible()){select.pageUp();}else{onChange(0,true);}break;case KEY.PAGEDOWN:event.preventDefault();if(select.visible()){select.pageDown();}else{onChange(0,true);}break;case options.multiple&&$.trim(options.multipleSeparator)==","&&KEY.COMMA:case KEY.TAB:case KEY.RETURN:if(selectCurrent()){event.preventDefault();blockSubmit=true;return false;}break;case KEY.ESC:select.hide();break;default:clearTimeout(timeout);timeout=setTimeout(onChange,options.delay);break;}}).focus(function(){hasFocus++;}).blur(function(){hasFocus=0;if(!config.mouseDownOnSelect){hideResults();}}).click(function(){if(hasFocus++>1&&!select.visible()){onChange(0,true);}}).bind("search",function(){var fn=(arguments.length>1)?arguments[1]:null;function findValueCallback(q,data){var result;if(data&&data.length){for(var i=0;i1){v=words.slice(0,words.length-1).join(options.multipleSeparator)+options.multipleSeparator+v;}v+=options.multipleSeparator;}$input.val(v);hideResultsNow();$input.trigger("result",[selected.data,selected.value]);return true;}function onChange(crap,skipPrevCheck){if(lastKeyPressCode==KEY.DEL){select.hide();return;}var currentValue=$input.val();if(!skipPrevCheck&¤tValue==previousValue)return;previousValue=currentValue;currentValue=lastWord(currentValue);if(currentValue.length>=options.minChars){$input.addClass(options.loadingClass);if(!options.matchCase)currentValue=currentValue.toLowerCase();request(currentValue,receiveData,hideResultsNow);}else{stopLoading();select.hide();}};function trimWords(value){if(!value){return[""];}var words=value.split(options.multipleSeparator);var result=[];$.each(words,function(i,value){if($.trim(value))result[i]=$.trim(value);});return result;}function lastWord(value){if(!options.multiple)return value;var words=trimWords(value);return words[words.length-1];}function autoFill(q,sValue){if(options.autoFill&&(lastWord($input.val()).toLowerCase()==q.toLowerCase())&&lastKeyPressCode!=KEY.BACKSPACE){$input.val($input.val()+sValue.substring(lastWord(previousValue).length));$.Autocompleter.Selection(input,previousValue.length,previousValue.length+sValue.length);}};function hideResults(){clearTimeout(timeout);timeout=setTimeout(hideResultsNow,200);};function hideResultsNow(){var wasVisible=select.visible();select.hide();clearTimeout(timeout);stopLoading();if(options.mustMatch){$input.search(function(result){if(!result){if(options.multiple){var words=trimWords($input.val()).slice(0,-1);$input.val(words.join(options.multipleSeparator)+(words.length?options.multipleSeparator:""));}else + $input.val("");}});}if(wasVisible)$.Autocompleter.Selection(input,input.value.length,input.value.length);};function receiveData(q,data){if(data&&data.length&&hasFocus){stopLoading();select.display(data,q);autoFill(q,data[0].value);select.show();}else{hideResultsNow();}};function request(term,success,failure){if(!options.matchCase)term=term.toLowerCase();var data=cache.load(term);if(data&&data.length){success(term,data);}else if((typeof options.url=="string")&&(options.url.length>0)){var extraParams={timestamp:+new Date()};$.each(options.extraParams,function(key,param){extraParams[key]=typeof param=="function"?param():param;});$.ajax({mode:"abort",port:"autocomplete"+input.name,dataType:options.dataType,url:options.url,data:$.extend({q:lastWord(term),limit:options.max},extraParams),success:function(data){var parsed=options.parse&&options.parse(data)||parse(data);cache.add(term,parsed);success(term,parsed);}});}else{select.emptyList();failure(term);}};function parse(data){var parsed=[];var rows=data.split("\n");for(var i=0;i]*)("+term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"$1");},scroll:true,scrollHeight:180};$.Autocompleter.Cache=function(options){var data={};var length=0;function matchSubset(s,sub){if(!options.matchCase)s=s.toLowerCase();var i=s.indexOf(sub);if(i==-1)return false;return i==0||options.matchContains;};function add(q,value){if(length>options.cacheLength){flush();}if(!data[q]){length++;}data[q]=value;}function populate(){if(!options.data)return false;var stMatchSets={},nullData=0;if(!options.url)options.cacheLength=1;stMatchSets[""]=[];for(var i=0,ol=options.data.length;i0){var c=data[k];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub.push(x);}});}}return csub;}else + if(data[q]){return data[q];}else + if(options.matchSubset){for(var i=q.length-1;i>=options.minChars;i--){var c=data[q.substr(0,i)];if(c){var csub=[];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub[csub.length]=x;}});return csub;}}}return null;}};};$.Autocompleter.Select=function(options,input,select,config){var CLASSES={ACTIVE:"ac_over"};var listItems,active=-1,data,term="",needsInit=true,element,list;function init(){if(!needsInit)return;element=$("
").hide().addClass(options.resultsClass).css("position","absolute").appendTo(document.body);list=$("
    ").appendTo(element).mouseover(function(event){if(target(event).nodeName&&target(event).nodeName.toUpperCase()=='LI'){active=$("li",list).removeClass(CLASSES.ACTIVE).index(target(event));$(target(event)).addClass(CLASSES.ACTIVE);}}).click(function(event){$(target(event)).addClass(CLASSES.ACTIVE);select();input.focus();return false;}).mousedown(function(){config.mouseDownOnSelect=true;}).mouseup(function(){config.mouseDownOnSelect=false;});if(options.width>0)element.css("width",options.width);needsInit=false;}function target(event){var element=event.target;while(element&&element.tagName!="LI")element=element.parentNode;if(!element)return[];return element;}function moveSelect(step){listItems.slice(active,active+1).removeClass(CLASSES.ACTIVE);movePosition(step);var activeItem=listItems.slice(active,active+1).addClass(CLASSES.ACTIVE);if(options.scroll){var offset=0;listItems.slice(0,active).each(function(){offset+=this.offsetHeight;});if((offset+activeItem[0].offsetHeight-list.scrollTop())>list[0].clientHeight){list.scrollTop(offset+activeItem[0].offsetHeight-list.innerHeight());}else if(offset=listItems.size()){active=0;}}function limitNumberOfItems(available){return options.max&&options.max").html(options.highlight(formatted,term)).addClass(i%2==0?"ac_even":"ac_odd").appendTo(list)[0];$.data(li,"ac_data",data[i]);}listItems=list.find("li");if(options.selectFirst){listItems.slice(0,1).addClass(CLASSES.ACTIVE);active=0;}if($.fn.bgiframe)list.bgiframe();}return{display:function(d,q){init();data=d;term=q;fillList();},next:function(){moveSelect(1);},prev:function(){moveSelect(-1);},pageUp:function(){if(active!=0&&active-8<0){moveSelect(-active);}else{moveSelect(-8);}},pageDown:function(){if(active!=listItems.size()-1&&active+8>listItems.size()){moveSelect(listItems.size()-1-active);}else{moveSelect(8);}},hide:function(){element&&element.hide();listItems&&listItems.removeClass(CLASSES.ACTIVE);active=-1;},visible:function(){return element&&element.is(":visible");},current:function(){return this.visible()&&(listItems.filter("."+CLASSES.ACTIVE)[0]||options.selectFirst&&listItems[0]);},show:function(){var offset=$(input).offset();element.css({width:typeof options.width=="string"||options.width>0?options.width:$(input).width(),top:offset.top+input.offsetHeight,left:offset.left}).show();if(options.scroll){list.scrollTop(0);list.css({maxHeight:options.scrollHeight,overflow:'auto'});if($.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var listHeight=0;listItems.each(function(){listHeight+=this.offsetHeight;});var scrollbarsVisible=listHeight>options.scrollHeight;list.css('height',scrollbarsVisible?options.scrollHeight:listHeight);if(!scrollbarsVisible){listItems.width(list.width()-parseInt(listItems.css("padding-left"))-parseInt(listItems.css("padding-right")));}}}},selected:function(){var selected=listItems&&listItems.filter("."+CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE);return selected&&selected.length&&$.data(selected[0],"ac_data");},emptyList:function(){list&&list.empty();},unbind:function(){element&&element.remove();}};};$.Autocompleter.Selection=function(field,start,end){if(field.createTextRange){var selRange=field.createTextRange();selRange.collapse(true);selRange.moveStart("character",start);selRange.moveEnd("character",end);selRange.select();}else if(field.setSelectionRange){field.setSelectionRange(start,end);}else{if(field.selectionStart){field.selectionStart=start;field.selectionEnd=end;}}field.focus();};})(jQuery); diff --git a/forum/skins/default/media/js/osqa.main.js b/forum/skins/default/media/js/osqa.main.js index 34d13b3..92d0aae 100644 --- a/forum/skins/default/media/js/osqa.main.js +++ b/forum/skins/default/media/js/osqa.main.js @@ -688,11 +688,11 @@ function pickedTags(){ multipleSeparator: " "*/ formatItem: function(row, i, max, value) { - return row[1].split(".")[0] + " (" + row[1].split(".")[1] + ")"; + return row[1] + " (" + row[2] + ")"; }, formatResult: function(row, i, max, value){ - return row[0]; + return row[1]; } }); diff --git a/forum/skins/default/media/style/djstyle_admin.css b/forum/skins/default/media/style/djstyle_admin.css index e8e8573..abc479b 100644 --- a/forum/skins/default/media/style/djstyle_admin.css +++ b/forum/skins/default/media/style/djstyle_admin.css @@ -1,3 +1,5 @@ +@import "jquery.autocomplete.css"; + textarea { width: 100%; } diff --git a/forum/skins/default/templates/osqaadmin/nodeman.html b/forum/skins/default/templates/osqaadmin/nodeman.html index d9576e5..5c5c44e 100644 --- a/forum/skins/default/templates/osqaadmin/nodeman.html +++ b/forum/skins/default/templates/osqaadmin/nodeman.html @@ -40,6 +40,65 @@ $boxes.removeAttr('checked'); } }); + + $('#author-selector').autocomplete('{% url matching_users %}', { + minChars: 1, + matchContains: true, + max: 10, + + formatItem: function(row, i, max, value) { + return row[1] + ' (' + row[2] + ' {% trans "rep" %})'; + }, + + formatResult: function(row, i, max, value){ + return row[1]; + } + }); + + $('#author-selector').result(function(event, data, formatted) { + if ($('#author-filter-container').find('input[value=' + data[0] + ']').length == 0) { + $('#author-filter-container').append($("")); + $form.submit(); + } + }); + + $('.author-filter-remover').click(function() { + var id = $(this).attr('rel'); + if ($('#author-filter-container').find('input[value=' + id + ']').length > 0) { + $('#author-filter-container').find('input[value=' + id + ']').remove(); + $form.submit(); + } + }); + + $('#tag-selector').autocomplete('{% url matching_tags %}', { + minChars: 1, + matchContains: true, + max: 10, + + formatItem: function(row, i, max, value) { + return row[1] + ' (' + row[2] + ' {% trans "uses" %})'; + }, + + formatResult: function(row, i, max, value){ + return row[1]; + } + }); + + $('#tag-selector').result(function(event, data, formatted) { + if ($('#tag-filter-container').find('input[value=' + data[0] + ']').length == 0) { + $('#tag-filter-container').append($("")); + $form.submit(); + } + }); + + $('.tag-filter-remover').click(function() { + var id = $(this).attr('rel'); + if ($('#tag-filter-container').find('input[value=' + id + ']').length > 0) { + $('#tag-filter-container').find('input[value=' + id + ']').remove(); + $form.submit(); + } + }); + }); + + + + {% endblock %} {% block subtitle %} @@ -63,12 +169,24 @@
    @@ -91,6 +209,37 @@ {% endfor %}
+

{% trans "By author(s)" %}

+ {% if not authors.count %} + {% trans "No users selected, use the box bellow to add users to the filter." %} + {% else %} +
    + {% for u in authors %} +
  • + + {{ u.decorated_name }} ({{ u.reputation }}) +
    • + {% endfor %} +
+ {% trans "Click on the cross next to a user name to remove it from the filter." %} + {% endif %} + + +

{% trans "By tag(s)" %}

+ {% if not tags.count %} + {% trans "No tags selected, use the box bellow to add tags to the filter." %} + {% else %} +
    + {% for t in tags %} +
  • + + {{ t.name }} ({{ t.used_count }}) +
    • + {% endfor %} +
+ {% trans "Click on the cross next to a tag name to remove it from the filter." %} + {% endif %} + {% comment %}

{% trans "Show" %}

{{ show_form.show }}
@@ -104,6 +253,8 @@ @@ -132,6 +283,8 @@ {% trans "Last activity at" %} + {% trans "Tags" %} + {% trans "State" %} {% endspaceless %} @@ -148,6 +301,13 @@ {{ node.score }} {{ node.last_activity_by.username }} {% diff_date node.last_activity_at %} + + {% for t in node.tags.all %} + {% if t in tags %}{{ t.name }} + {% else %}{{ t.name }}{% endif %} + {% endfor %} + + {{ node.state_list|join:", " }} {% endfor %} diff --git a/forum/urls.py b/forum/urls.py index c2720e5..3547fc2 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -90,6 +90,7 @@ urlpatterns += patterns('', url(r'^%s(?P\d+)/(?P\d+)?$' % _('subscribe/'), app.commands.subscribe, name="subscribe"), url(r'^%s(?P\d+)/$' % _('subscribe/'), app.commands.subscribe, name="subscribe_simple"), url(r'^%s' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'), + url(r'^%s' % _('matching_users/'), app.commands.matching_users, name='matching_users'), url(r'^%s(?P\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'), url(r'^%s(?P\d+)/' % _('convert/'), app.commands.convert_to_comment, name='convert_to_comment'), diff --git a/forum/utils/pagination.py b/forum/utils/pagination.py index ca7c272..4dda664 100644 --- a/forum/utils/pagination.py +++ b/forum/utils/pagination.py @@ -107,7 +107,7 @@ class PaginatorContext(object): def page(self, request): try: - return int(request.GET.get(self.PAGE, 1)) + return int(request.GET.get(self.PAGE, "1").strip()) except ValueError: logging.error('Found invalid page number "%s", loading %s, refered by %s' % ( request.GET.get(self.PAGE, ''), request.path, request.META.get('HTTP_REFERER', 'UNKNOWN') diff --git a/forum/views/admin.py b/forum/views/admin.py index 7f83f9a..b131d8f 100644 --- a/forum/views/admin.py +++ b/forum/views/admin.py @@ -14,9 +14,9 @@ from forum.forms import MaintenanceModeForm, PageForm, NodeManFilterForm, Create from forum.settings.forms import SettingsSetForm from forum.utils import pagination, html -from forum.models import Question, Answer, User, Node, Action, Page, NodeState +from forum.models import Question, Answer, User, Node, Action, Page, NodeState, Tag from forum.models.node import NodeMetaClass -from forum.actions import NewPageAction, EditPageAction, PublishAction, DeleteAction, UserJoinsAction +from forum.actions import NewPageAction, EditPageAction, PublishAction, DeleteAction, UserJoinsAction, CloseAction from forum import settings TOOLS = {} @@ -434,6 +434,25 @@ def node_management(request): message = _("All selected nodes marked as deleted") + if action == "close_selected": + for node in selected_nodes: + if node.node_type == "question" and (not node.nis.closed): + CloseAction(node=node.leaf, user=request.user, extra=_("bulk close"), ip=request.META['REMOTE_ADDR']).save() + + message = _("Selected questions were closed") + + if action == "hard_delete_selected": + ids = [n.id for n in selected_nodes] + + for id in ids: + try: + node = Node.objects.get(id=id) + node.delete() + except: + pass + + message = _("All selected nodes deleted") + request.user.message_set.create(message=message) return HttpResponseRedirect(reverse("admin_tools", kwargs={'name': 'nodeman'})) @@ -445,6 +464,9 @@ def node_management(request): else: filter_form = NodeManFilterForm({'node_type': 'all', 'state_type': 'any'}) + authors = request.GET.getlist('authors') + tags = request.GET.getlist('tags') + if filter_form.is_valid(): data = filter_form.cleaned_data @@ -454,6 +476,14 @@ def node_management(request): if (data['state_type'] != 'any'): nodes = nodes.filter_state(**{str(data['state_type']): True}) + if (authors): + nodes = nodes.filter(author__id__in=authors) + authors = User.objects.filter(id__in=authors) + + if (tags): + nodes = nodes.filter(tags__id__in=tags) + tags = Tag.objects.filter(id__in=tags) + if data['text']: filter = None @@ -469,9 +499,6 @@ def node_management(request): if filter: nodes = nodes.filter(filter) - else: - print filter_form.errors - node_types = [('all', _("all"))] + [(k, n.friendly_name) for k, n in NodeMetaClass.types.items()] state_types = NodeState.objects.filter(node__in=nodes).values_list('state_type', flat=True).distinct('state_type') @@ -481,6 +508,8 @@ def node_management(request): 'node_types': node_types, 'state_types': state_types, 'filter_form': filter_form, + 'authors': authors, + 'tags': tags, 'hide_menu': True })) diff --git a/forum/views/commands.py b/forum/views/commands.py index ad6d773..ea58406 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -493,10 +493,22 @@ def matching_tags(request): possible_tags = Tag.active.filter(name__istartswith = request.GET['q']) tag_output = '' for tag in possible_tags: - tag_output += (tag.name + "|" + tag.name + "." + tag.used_count.__str__() + "\n") + tag_output += "%s|%s|%s\n" % (tag.id, tag.name, tag.used_count) return HttpResponse(tag_output, mimetype="text/plain") +def matching_users(request): + if len(request.GET['q']) == 0: + raise CommandException(_("Invalid request")) + + possible_users = User.objects.filter(username__istartswith = request.GET['q']) + output = '' + + for user in possible_users: + output += ("%s|%s|%s\n" % (user.id, user.decorated_name, user.reputation)) + + return HttpResponse(output, mimetype="text/plain") + def related_questions(request): if request.POST and request.POST.get('title', None): can_rank, questions = Question.objects.search(request.POST['title']) diff --git a/forum_modules/pgfulltext/handlers.py b/forum_modules/pgfulltext/handlers.py index 04d3a67..9d8f954 100644 --- a/forum_modules/pgfulltext/handlers.py +++ b/forum_modules/pgfulltext/handlers.py @@ -1,6 +1,8 @@ import re +from django.db import connection, transaction from django.db.models import Q from forum.models.question import Question, QuestionManager +from forum.models.node import Node from forum.modules import decorate word_re = re.compile(r'\w+', re.UNICODE) @@ -26,5 +28,18 @@ def question_search(self, keywords): ) +def delete_docs(node): + cursor = connection.cursor() + cursor.execute("DELETE FROM forum_rootnode_doc WHERE node_id = %s" % (node.id)) + + for n in node.children.all(): + delete_docs(n) + + +#@decorate(Node.delete) +def delete(origin, self, *args, **kwargs): + delete_docs(self) + transaction.commit_unless_managed() + origin(self, *args, **kwargs) diff --git a/forum_modules/pgfulltext/pg_fts_install.sql b/forum_modules/pgfulltext/pg_fts_install.sql index 5d5d9b8..e08e22b 100644 --- a/forum_modules/pgfulltext/pg_fts_install.sql +++ b/forum_modules/pgfulltext/pg_fts_install.sql @@ -116,4 +116,5 @@ begin end $$ LANGUAGE plpgsql; +ALTER table forum_rootnode_doc DISABLE TRIGGER ALL; UPDATE forum_noderevision SET id = id WHERE TRUE; diff --git a/forum_modules/pgfulltext/startup.py b/forum_modules/pgfulltext/startup.py index fc7840b..cbb4138 100644 --- a/forum_modules/pgfulltext/startup.py +++ b/forum_modules/pgfulltext/startup.py @@ -3,7 +3,7 @@ from forum.models import KeyValue from django.db import connection, transaction import settings -VERSION = 9 +VERSION = 10 if int(settings.PG_FTSTRIGGERS_VERSION) < VERSION: f = open(os.path.join(os.path.dirname(__file__), 'pg_fts_install.sql'), 'r') -- 2.39.5