Removing hitcount from project, since deprected code, and not in use …

…anywhere
hasadna · Oct 17, 2016 · 21828c1 · 21828c1
1 parent 78e1bfb
commit 21828c1
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 46 deletions.
diff --git a/knesset/settings.py b/knesset/settings.py
@@ -144,7 +144,7 @@
     'django_extensions',
     'actstream',
     'avatar',
-    'hitcount',
+
     'annotatetext',
     'mailer',
     'backlinks',
@@ -276,10 +276,6 @@
 AUTO_GENERATE_AVATAR_SIZES = (75, 48)
 AVATAR_GRAVATAR_BASE_URL = 'https://www.gravatar.com/avatar/'
 
-HITCOUNT_KEEP_HIT_ACTIVE = {'hours': 1}
-HITCOUNT_HITS_PER_IP_LIMIT = 0
-HITCOUNT_EXCLUDE_USER_GROUP = ()
-
 NOSE_ARGS = ['--with-xunit']
 
 SERIALIZATION_MODULES = {

diff --git a/knesset/urls.py b/knesset/urls.py
@@ -3,13 +3,11 @@
 from django.conf.urls import include, url, patterns
 from django.contrib import admin
 from django.views.generic import RedirectView
-from django.views.decorators.cache import cache_page
-# from django.contrib.sitemaps import views as sitemaps_views
-from fastsitemaps import views as sitemaps_views
+
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns, static
 
 from planet import views as planet_views
-from hitcount.views import update_hit_count_ajax
+
 from backlinks.trackback.server import TrackBackServer
 from backlinks.pingback.server import default_server
 from voting.views import vote_on_object
@@ -19,8 +17,7 @@
 from mks.urls import mksurlpatterns
 from laws.urls import lawsurlpatterns
 from committees.urls import committeesurlpatterns
-from ok_tag.views import TagList, TagDetail, suggest_tag_post, add_tag_synonym, remove_tag_from_object, \
-    add_tag_to_object, untagged_objects
+
 from plenum.urls import plenumurlpatterns
 from persons.urls import personsurlpatterns
 from mks.views import get_mk_entry, mk_is_backlinkable
@@ -77,7 +74,7 @@
         {'sitemaps': sitemaps_dict},
         name='sitemaps'),
     (r'^planet/', include('planet.urls')),
-    url(r'^ajax/hit/$', update_hit_count_ajax, name='hitcount_update_ajax'),
+
     (r'^annotate/write/$', post_annotation, {}, 'annotatetext-post_annotation'),
     (r'^annotate/', include('annotatetext.urls')),
     (r'^avatar/', include('avatar.urls')),

diff --git a/requirements.txt b/requirements.txt
@@ -26,7 +26,6 @@ python-memcached==1.48
 -e git://github.com/openid/python-openid.git#egg=python-openid
 django-tastypie==0.9.15
 django-ratings
--e git://github.com/thornomad/django-hitcount.git@178680e43766982f5ebf05b6b5620e9fea70b37c#egg=django-hitcount
 -e git://github.com/hasadna/django-activity-stream.git@c56a07921b8c796fce35bda6feab4610fdf64e5d#egg=django-activity-stream
 -e git://github.com/hasadna/django-planet.git@903de33db55bfb8d965ae4e2319fa348075351fd#egg=django-planet
 -e git://github.com/hasadna/django-annotatetext.git@72e1e69459b1efe3efad85eec1dd162f5ab03250#egg=django-annotatetext

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
     'vobject',
     'django-tastypie',
     'django-ratings',
-    'django-hitcount',
+
 ]
 
 setup(

diff --git a/simple/management/commands/sync_dev.py b/simple/management/commands/sync_dev.py
@@ -18,9 +18,15 @@ class Command(NoArgsCommand):
     reset_models = ('contenttypes.contenttype', 'sites.site',
                     'flatpages.flatpage')
     ignore_models = (
-        'sessions.session', 'auth.message', 'mailer',
-        'accounts.email_validation', 'hitcount', 'actstream.follow',
-        'avatar', 'suggestions', 'auxiliary.feedback', 'default.code',
+        'sessions.session',
+        'auth.message',
+        'mailer',
+        'accounts.email_validation',
+        'actstream.follow',
+        'avatar',
+        'suggestions',
+        'auxiliary.feedback',
+        'default.code',
         'corsheaders.corsmodel')
     only_latest = ('actstream.action', 'committees.protocolpart',
                    'committees.committeemeeting')

diff --git a/templates/agendas/agenda_bill_detail.html b/templates/agendas/agenda_bill_detail.html
@@ -1,5 +1,5 @@
 {% extends "site_base.html" %}
-{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags hitcount_tags committees_tags %}
+{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags committees_tags %}
 {% block extratitle %}{{ title }}{% endblock %}
 {% block keywords %}{{ title }}{% endblock %}
 {% block description %}{{ title }} - {% trans 'Open Knesset - Opening the Knesset to the public' %}{% endblock %}

diff --git a/templates/agendas/agenda_detail.html b/templates/agendas/agenda_detail.html
@@ -1,5 +1,5 @@
 {% extends "site_base.html" %}
-{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags hitcount_tags committees_tags %}
+{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags committees_tags %}
 {% load static from staticfiles %}
 {% block extratitle %}{{ object.name }}{% endblock %}
 {% block keywords %}{{ object.name }}{% endblock %}
@@ -170,11 +170,7 @@ <h2>{% trans 'Agenda Bottom MKs' %}</h2>
 {% endblock %} {# divcontent #}
 
 {% block footer %}
-<script type="text/javascript"><!--
-    $(document).ready(function() {
-        {% get_hit_count_javascript for object %}
-    });
---></script>
+
 {% endblock %}
 
 
diff --git a/templates/agendas/agenda_meeting_detail.html b/templates/agendas/agenda_meeting_detail.html
@@ -1,5 +1,5 @@
 {% extends "site_base.html" %}
-{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags hitcount_tags committees_tags %}
+{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags committees_tags %}
 {% block extratitle %}{{ title }}{% endblock %}
 {% block keywords %}{{ title }}{% endblock %}
 {% block description %}{{ title }} - {% trans 'Open Knesset - Opening the Knesset to the public' %}{% endblock %}

diff --git a/templates/agendas/agenda_vote_detail.html b/templates/agendas/agenda_vote_detail.html
@@ -1,5 +1,5 @@
 {% extends "site_base.html" %}
-{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags hitcount_tags committees_tags %}
+{% load lookup i18n tagging_tags laws_tags bills_tags common_visual_elements links_tags comments user_tags committees_tags %}
 {% block extratitle %}{{ title }}{% endblock %}
 {% block keywords %}{{ title }}{% endblock %}
 {% block description %}{{ title }} - {% trans 'Open Knesset - Opening the Knesset to the public' %}{% endblock %}

diff --git a/templates/agendas/mk_agenda_detail.html b/templates/agendas/mk_agenda_detail.html
@@ -1,5 +1,5 @@
 {% extends "site_base.html" %}
-{% load i18n tagging_tags laws_tags common_visual_elements links_tags comments user_tags hitcount_tags %}
+{% load i18n tagging_tags laws_tags common_visual_elements links_tags comments user_tags %}
 {% load static from staticfiles %}
 {% block extratitle %}{{ title }}{% endblock %}
 {% block keywords %}{{ object.name }}, {{ member }}{% endblock %}
@@ -14,11 +14,7 @@
 {% block nav-agendas %}class="active"{% endblock %}
 
 {% block extrajs %}
-<script type="text/javascript"><!--
-    $(document).ready(function() {
-        {% get_hit_count_javascript for object %}
-    });
---></script>
+
 {% endblock %}
 
 {% block divcontent %}

diff --git a/templates/committees/committeemeeting_detail.html b/templates/committees/committeemeeting_detail.html
@@ -1,5 +1,5 @@
 {% extends "site_base.html" %}
-{% load i18n comments annotatetags hashtag mks_tags agendas_tags hitcount_tags pagination_tags %}
+`{% load i18n comments annotatetags hashtag mks_tags agendas_tags pagination_tags %}
 {% load static from staticfiles %}
 
 {% block extratitle %}{{ object.topics|safe|truncatewords:10 }}{% endblock %}
@@ -15,12 +15,7 @@
     <script type="text/javascript" src="{% static "js/jquery.autocomplete.js" %}"></script>
     <script type="text/javascript" src="{% static "js/waypoints.min.js" %}"> </script>
     <script type="text/javascript" src="{% static "js/committeemeeting_detail.js" %}"> </script>
-<script type="text/javascript">
-    $(document).ready(function() {
-        {% get_hit_count_javascript for object %}
-    });
-    // current hit count = {% get_hit_count for object %}
-</script>
+
 {% include "auxiliary/tags_object_edit_extrajs.html" with app_label="committees" object_type="committeemeeting" object_id=object.id %}
 {% endblock %}
 

diff --git a/templates/committees/committeemeeting_detail/protocol.html b/templates/committees/committeemeeting_detail/protocol.html
@@ -2,7 +2,7 @@
     this is used by the infinite scroll js in unexpected ways
     if you make any change here be sure to check the infinite scroll
 {% endcomment %}
-{% load i18n comments annotatetags hashtag mks_tags agendas_tags hitcount_tags pagination_tags  %}
+{% load i18n comments annotatetags hashtag mks_tags agendas_tags pagination_tags  %}
 {% get_annotations_for parts as annotation_dict %}
 {% for speech_part in parts %}
     {% with speech_part.id as spid %}

diff --git a/templates/planet/posts/detail.html b/templates/planet/posts/detail.html
@@ -1,5 +1,5 @@
 {% extends "planet/base.html" %}
-{% load i18n planet_tags hitcount_tags %}
+{% load i18n planet_tags %}
 
 {% block page_title %}{{ post.title|safe }} - {{ block.super }}{% endblock %}
 {% block extrameta %}
@@ -8,11 +8,7 @@
 {% endblock %}
 
 {% block content %}
-    <script type="text/javascript">
-   			$(document).ready(function() {
-       			{% get_hit_count_javascript for post %}
-   			});
-	</script>
+
     <div class="post clearfix">
         {% post_full_details post %}
     </div>