diff --git a/docs/releases/1.1.rst b/docs/releases/1.1.rst index 30816d4a75..df2967c172 100644 --- a/docs/releases/1.1.rst +++ b/docs/releases/1.1.rst @@ -58,6 +58,7 @@ Next upgrade/add the new requirements:: Migrate existing database schema with:: + $ mayan-edms.py migrate dynamic_search 0001 --fake $ mayan-edms.py migrate tags 0001 --fake $ mayan-edms.py migrate diff --git a/mayan/apps/dynamic_search/migrations/0001_initial.py b/mayan/apps/dynamic_search/migrations/0001_initial.py new file mode 100644 index 0000000000..b69b60b81a --- /dev/null +++ b/mayan/apps/dynamic_search/migrations/0001_initial.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'RecentSearch' + db.create_table(u'dynamic_search_recentsearch', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('query', self.gf('django.db.models.fields.TextField')()), + ('datetime_created', self.gf('django.db.models.fields.DateTimeField')()), + ('hits', self.gf('django.db.models.fields.IntegerField')()), + )) + db.send_create_signal(u'dynamic_search', ['RecentSearch']) + + + def backwards(self, orm): + # Deleting model 'RecentSearch' + db.delete_table(u'dynamic_search_recentsearch') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'dynamic_search.recentsearch': { + 'Meta': {'ordering': "('-datetime_created',)", 'object_name': 'RecentSearch'}, + 'datetime_created': ('django.db.models.fields.DateTimeField', [], {}), + 'hits': ('django.db.models.fields.IntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query': ('django.db.models.fields.TextField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['dynamic_search'] \ No newline at end of file diff --git a/mayan/apps/dynamic_search/migrations/0002_auto__chg_field_recentsearch_datetime_created__add_index_recentsearch_.py b/mayan/apps/dynamic_search/migrations/0002_auto__chg_field_recentsearch_datetime_created__add_index_recentsearch_.py new file mode 100644 index 0000000000..6194cb8b9b --- /dev/null +++ b/mayan/apps/dynamic_search/migrations/0002_auto__chg_field_recentsearch_datetime_created__add_index_recentsearch_.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'RecentSearch.datetime_created' + db.alter_column(u'dynamic_search_recentsearch', 'datetime_created', self.gf('django.db.models.fields.DateTimeField')(auto_now=True)) + # Adding index on 'RecentSearch', fields ['datetime_created'] + db.create_index(u'dynamic_search_recentsearch', ['datetime_created']) + + + def backwards(self, orm): + # Removing index on 'RecentSearch', fields ['datetime_created'] + db.delete_index(u'dynamic_search_recentsearch', ['datetime_created']) + + + # Changing field 'RecentSearch.datetime_created' + db.alter_column(u'dynamic_search_recentsearch', 'datetime_created', self.gf('django.db.models.fields.DateTimeField')()) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'dynamic_search.recentsearch': { + 'Meta': {'ordering': "('-datetime_created',)", 'object_name': 'RecentSearch'}, + 'datetime_created': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'hits': ('django.db.models.fields.IntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query': ('django.db.models.fields.TextField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['dynamic_search'] \ No newline at end of file diff --git a/mayan/apps/dynamic_search/migrations/__init__.py b/mayan/apps/dynamic_search/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/dynamic_search/models.py b/mayan/apps/dynamic_search/models.py index 8688d7159a..0e44a4bfa4 100644 --- a/mayan/apps/dynamic_search/models.py +++ b/mayan/apps/dynamic_search/models.py @@ -7,7 +7,6 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.db import models from django.utils.encoding import smart_str, smart_unicode -from django.utils.timezone import now from django.utils.translation import ugettext as _ from .classes import SearchModel @@ -25,7 +24,7 @@ class RecentSearch(models.Model): # TODO: Fix after upgrade to DRF v2.4.4 query = models.TextField(verbose_name=_(u'Query'), editable=False) - datetime_created = models.DateTimeField(verbose_name=_(u'Datetime created'), editable=False) + datetime_created = models.DateTimeField(verbose_name=_(u'Datetime created'), auto_now=True, db_index=True) hits = models.IntegerField(verbose_name=_(u'Hits'), editable=False) objects = RecentSearchManager() @@ -51,7 +50,6 @@ class RecentSearch(models.Model): return u'%s (%s)' % (display_string, self.hits) def save(self, *args, **kwargs): - self.datetime_created = now() super(RecentSearch, self).save(*args, **kwargs) def url(self):