Commit Graph

1322 Commits (5d3c749a6a37b7f2ee9cae7605bac3b7b1536a95)

Author SHA1 Message Date
Raymond Yee 405af3b2e7 Merge pull request #646 from Gluejar/id-facets
Id facets
2016-11-14 11:21:40 -08:00
eric 59e92b8efc add facets for doab and gtbg 2016-11-10 16:21:57 -05:00
eric ab57985b33 expose gutenberg and doab status on work page
also, refactor id properties on work
2016-11-10 16:21:21 -05:00
eric a49be9e61f blank=True, not null=True 2016-11-09 14:55:37 -05:00
Raymond Yee 5572608b39 Merge pull request #641 from Gluejar/improve-doab-import
Improve doab import
2016-11-02 06:06:41 -07:00
eric 60e4994756 remove debugging prints 2016-11-01 13:42:40 -04:00
eric b82b51f358 forgot to re-enable error catching 2016-10-31 22:19:00 -04:00
eric 1c7df5e00e get rid of some loader issues 2016-10-28 14:40:16 -04:00
eric 39cf8c9c0b fix load errors 2016-10-27 20:05:43 -04:00
eric 8697aec989 management command to clean the db 2016-10-20 15:25:09 -04:00
eric d95f81030f add sanitization code to edition form 2016-10-20 15:24:47 -04:00
eric 182887fdc2 remove async option 2016-10-12 16:19:43 -04:00
eric 167c7fc60a update doab loader 2016-10-12 16:07:54 -04:00
eric d4f47b2a5e handle age_level in merge_works 2016-10-12 13:55:27 -04:00
eric 3ac7769656 move doab.py into loaders 2016-10-11 15:46:03 -04:00
Raymond Yee 9a15a1c832 Merge pull request #638 from Gluejar/questionnaire_export
Questionnaire export
2016-10-11 08:26:03 -07:00
Raymond Yee f7338f2276 delete core/models.py because we already have core/__init__.py 2016-10-10 15:07:14 -07:00
eric b0663d435b Merge branch 'master' into questionnaire_export 2016-10-05 15:43:51 -04:00
eric 0e7320d4e8 integrate exports into unglue.it surveys 2016-10-05 15:36:20 -04:00
eric 6c4874c3b2 tighten ebook notifications
The 0006_auto_20160818_1809 migration created inactive ebooks for
campaign books. These new ebooks triggered user notifications. Now the
new ebook notification is only sent if there's a new ebook. Also, it's
been a known issue #76568402 that we should stop notifying ebooks for
users who fave newly available ebooks.
2016-10-04 13:22:01 -04:00
eric 23439bebe8 fix missing import 2016-09-30 17:55:27 -04:00
Raymond Yee 4405b4ee73 change regluit.core.tests.BookLoaderTests.test_add_related to test whether every WorkRelation points back properly 2016-09-29 15:15:46 -07:00
Raymond Yee 2e9ff2bf1c got regluit.core.tests.BookLoaderTests.test_add_related to work now -- but have to check
with Eric to see whether it's exactly the right test
2016-09-29 15:02:27 -07:00
eric 5fc4d631ff split version into label and iter 2016-09-23 14:53:58 -04:00
Raymond Yee e8d4ab82be add comments to this migration 2016-09-22 14:28:49 -07:00
Raymond Yee 0e75a750ab an extra migration produced by `makemigrations` 2016-09-15 11:50:31 -07:00
Raymond Yee 243e7d8029 fix error:
======================================================================
ERROR: test_nix (regluit.api.tests.FeedTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/api/tests.py", line 173, in test_nix
    r = self.client.get('/api/onix/by/')
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 500, in get
    **extra)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 303, in get
    return self.generic('GET', path, secure=secure, **r)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 379, in generic
    return self.request(**r)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 466, in request
    six.reraise(*exc_info)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/core/handlers/base.py", line 132, in get_response
    response = wrapped_callback(request, *callback_args, **callback_kwargs)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/views/generic/base.py", line 71, in view
    return self.dispatch(request, *args, **kwargs)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/views/generic/base.py", line 89, in dispatch
    return handler(request, *args, **kwargs)
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/api/views.py", line 208, in get
    return HttpResponse(onix.onix_feed(facet_class, max),
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/api/onix.py", line 25, in onix_feed
    editions = facet.facet_object.filter_model("Edition",editions).distinct()
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/core/facets.py", line 44, in filter_model
    return model_filter( self._filter_model(model, query_set))
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/core/facets.py", line 147, in edition_license_filter
    return query_set.filter(ebooks__rights=cc.ccinfo(facet_name))
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/query.py", line 679, in filter
    return self._filter_or_exclude(False, *args, **kwargs)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/query.py", line 697, in _filter_or_exclude
    clone.query.add_q(Q(*args, **kwargs))
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1310, in add_q
    clause, require_inner = self._add_q(where_part, self.used_aliases)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1338, in _add_q
    allow_joins=allow_joins, split_subq=split_subq,
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1177, in build_filter
    if isinstance(value, Iterator):
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/abc.py", line 144, in __instancecheck__
    return cls.__subclasscheck__(subtype)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/abc.py", line 180, in __subclasscheck__
    if issubclass(subclass, scls):
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/abc.py", line 161, in __subclasscheck__
    ok = cls.__subclasshook__(subclass)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/backports_abc.py", line 66, in __subclasshook__
    mro = C.__mro__
AttributeError: class ccinfo has no attribute '__mro__'
2016-09-12 10:42:12 -07:00
eric 64de760d63 test was non-deterministic 2016-08-26 13:10:43 -04:00
eric f2e6afc3af clean up admin 2016-08-25 17:56:16 -04:00
eric c0efbf86ea add unglueitar fix 2016-08-25 17:55:29 -04:00
eric 205af6876d fix unicode unglueitar 2016-08-25 16:02:54 -04:00
eric 5eabbbb4d2 implement versions in api 2016-08-24 15:43:28 -04:00
eric 7ad0d7f494 implemented ebook versions
It turned out that ebookfile handling needed revamping with the
addition of ebook versions; so this change turned out to be rather big.
2016-08-24 15:41:29 -04:00
eric 651f45f624 fix short authors
ordering by relation_code didn't pick up the author when ther was an
"author of introduction"
2016-08-18 15:56:25 -04:00
eric 363c86fd94 implement EditionNote 2016-08-16 17:16:44 -04:00
eric aafbd7c70b set translation relation in add_related 2016-08-16 11:42:58 -04:00
eric b3cefc2d3c implement related works 2016-08-15 18:28:39 -04:00
eric abedff089c add direct support for doi 2016-08-08 16:27:12 -04:00
eric c650c672c2 change the models 2016-08-05 15:53:29 -04:00
eric 1e7ea4b43c finish the refactor 2016-07-30 14:25:49 -04:00
eric 24c1cf8a03 refactor the models 2016-07-30 02:36:01 -04:00
eric c97888df82 pylint the models 2016-07-30 02:35:32 -04:00
eric 33a1482cc7 refactor libraryauth
try to keep all the user reg stuff in libraryauth, in prep for
splitting it off
2016-07-28 15:28:05 -04:00
eric 65007e1c9d contenttypes.generic is deprecated 2016-07-26 17:43:19 -04:00
eric 4adf6917ff refactor admin 2016-07-26 10:34:45 -04:00
eric 06d240f5e4 Fix a TypeError raised by a thanks campaign with no ebook
https://docs.djangoproject.com/en/1.9/releases/1.7/#templates
2016-07-25 13:15:53 -04:00
eric 09fe1a5d32 switch from deprecated get_model a app registry 2016-07-24 18:39:36 -04:00
eric da7b3171ce Use django's system check instead 2016-07-24 16:28:07 -04:00
eric b1e6dcec4f update tests for explicit fixture loading 2016-07-23 12:08:28 -04:00
eric 9e3fef8e9e fix models so django migrate can build an empty db 2016-07-22 18:49:19 -04:00