search

nimbis / cmsplugin-newsplus

An improved version of cmsplugin-news
BSD 2-Clause "Simplified" License
5 stars 10 forks source link

Feature/upstream merge 16 02 #16

Closed ghost closed 8 years ago

ghost commented 8 years ago

Hi, I already did a an upstream merge and fix the merge conflicts. This is in response to: https://github.com/nimbis/cmsplugin-newsplus/pull/5

ericamador commented 8 years ago

Thanks for the pull request. I'll personally review these changes today or tomorrow, but someone from my team may get to it before me.

electroniceagle commented 8 years ago

Thanks for your contribution. I'll do a release to pypi shortly.

electroniceagle commented 8 years ago 
  File "/Users/bschott/Source/cmsplugin-newsplus/cmsplugin_newsplus/migrations/0002_auto_20150501_0537.py", line 18, in Migration
    field=models.DateTimeField(default=cmsplugin_newsplus.models.get_default_pub_date, verbose_name='Publication date'),
AttributeError: 'module' object has no attribute 'get_default_pub_date'

Hmm, so I had to remove cmsplugin_newsplus/migrations/0002_auto_20150501_0537.py because it references a method that doesn't exist. Can you take another crack at a pull request against master? The migration should be 0003, not 0002.

electroniceagle commented 8 years ago

You can test the repo with make reqs, make test.