JSON to get work/edition data for an isbn
- {{base_url}}/api/v1/identifier/?format=json&api_key={api_key}&ype=isbn&value=9780441012039 + {{base_url}}/api/v1/identifier/?format=json&api_key={api_key}&username={username}&ype=isbn&value=9780441012039In addition to isbn, you can use 'goog' if you have a google books id, and 'oclc' for oclc numbers.
{% endif %} diff --git a/api/tests.py b/api/tests.py index 7d04ee89..755340d8 100755 --- a/api/tests.py +++ b/api/tests.py @@ -70,6 +70,16 @@ class ApiTests(TestCase): self.assertEqual(j['meta']['logged_in_username'], None) self.assertEqual(j['objects'][0]['in_wishlist'], False) + def test_identifier_lookup(self): + r = self.client.get('/api/v1/identifier/', data={ + 'format': 'json', + 'value': regluit.core.isbn.convert_10_to_13('0441012035'), + 'type': 'isbn', + 'username': self.user.username, + 'api_key': self.user.api_key.key + }) + self.assertEqual(r.status_code, 200) + def test_logged_in_user_info(self): # login and see if adding a work to the users wishlist causes # it to show up as in_wishlist in the campaign info diff --git a/core/models.py b/core/models.py index fcbe59ad..3294c22d 100755 --- a/core/models.py +++ b/core/models.py @@ -111,9 +111,10 @@ class CampaignAction(models.Model): type = models.CharField(max_length=15) comment = models.TextField(null=True, blank=True) campaign = models.ForeignKey("Campaign", related_name="actions", null=False) - -class Campaign(models.Model): - LICENSE_CHOICES = (('CC BY-NC-ND','CC BY-NC-ND'), + +class CCLicense(): + CCCHOICES = ( + ('CC BY-NC-ND','CC BY-NC-ND'), ('CC BY-ND','CC BY-ND'), ('CC BY','CC BY'), ('CC BY-NC','CC BY-NC'), @@ -121,6 +122,53 @@ class Campaign(models.Model): ( 'CC BY-SA','CC BY-SA'), ( 'CC0','CC0'), ) + CHOICES = CCCHOICES+(('PD-US', 'Public Domain, US'),) + + @classmethod + def url(klass, license): + if license == 'PD-US': + return 'http://creativecommons.org/publicdomain/mark/1.0/' + elif license == 'CC0': + return 'http://creativecommons.org/publicdomain/zero/1.0/' + elif license == 'CC BY': + return 'http://creativecommons.org/licenses/by/3.0/' + elif license == 'CC BY-NC-ND': + return 'http://creativecommons.org/licenses/by-nc-nd/3.0/' + elif license == 'CC BY-NC-SA': + return 'http://creativecommons.org/licenses/by-nc-sa/3.0/' + elif license == 'CC BY-NC': + return 'http://creativecommons.org/licenses/by-nc/3.0/' + elif license == 'CC BY-SA': + return 'http://creativecommons.org/licenses/by-sa/3.0/' + elif license == 'CC BY-ND': + return 'http://creativecommons.org/licenses/by-nd/3.0/' + else: + return '' + + @classmethod + def badge(klass,license): + if license == 'PD-US': + return 'https://i.creativecommons.org/p/mark/1.0/88x31.png' + elif license == 'CC0': + return 'https://i.creativecommons.org/p/zero/1.0/88x31.png' + elif license == 'CC BY': + return 'https://i.creativecommons.org/l/by/3.0/88x31.png' + elif license == 'CC BY-NC-ND': + return 'https://i.creativecommons.org/l/by-nc-nd/3.0/88x31.png' + elif license == 'CC BY-NC-SA': + return 'https://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png' + elif license == 'CC BY-NC': + return 'https://i.creativecommons.org/l/by-nc/3.0/88x31.png' + elif license == 'CC BY-SA': + return 'https://i.creativecommons.org/l/by-sa/3.0/88x31.png' + elif license == 'CC BY-ND': + return 'https://i.creativecommons.org/l/by-nd/3.0/88x31.png' + else: + return '' + + +class Campaign(models.Model): + LICENSE_CHOICES = CCLicense.CCCHOICES created = models.DateTimeField(auto_now_add=True) name = models.CharField(max_length=500, null=True, blank=False) description = models.TextField(null=True, blank=False) @@ -269,13 +317,22 @@ class Campaign(models.Model): def rightsholder(self): """returns the name of the rights holder for an active or initialized campaign""" try: - if self.status=='ACTIVE' or self.status=='INITIALIZED': - q = Q(status='ACTIVE') | Q(status='INITIALIZED') - rh = self.work.claim.filter(q)[0].rights_holder.rights_holder_name - return rh + if self.status=='ACTIVE' or self.status=='INITIALIZED': + q = Q(status='ACTIVE') | Q(status='INITIALIZED') + rh = self.work.claim.filter(q)[0].rights_holder.rights_holder_name + return rh except: pass return '' + + @property + def license_url(self): + return CCLicense.url(self.license) + + @property + def license_badge(self): + return CCLicense.badge(self.license) + class Identifier(models.Model): # olib, ltwk, goog, gdrd, thng, isbn, oclc, olwk, olib, gute, glue @@ -610,15 +667,7 @@ class WasWork(models.Model): class Ebook(models.Model): FORMAT_CHOICES = (('pdf','PDF'),( 'epub','EPUB'), ('html','HTML'), ('text','TEXT'), ('mobi','MOBI')) - RIGHTS_CHOICES = (('PD-US', 'Public Domain, US'), - ('CC BY-NC-ND','CC BY-NC-ND'), - ('CC BY-ND','CC BY-ND'), - ('CC BY','CC BY'), - ('CC BY-NC','CC BY-NC'), - ( 'CC BY-NC-SA','CC BY-NC-SA'), - ( 'CC BY-SA','CC BY-SA'), - ( 'CC0','CC0'), - ) + RIGHTS_CHOICES = CCLicense.CHOICES url = models.URLField(max_length=1024) created = models.DateTimeField(auto_now_add=True) format = models.CharField(max_length=25, choices = FORMAT_CHOICES) @@ -635,27 +684,9 @@ class Ebook(models.Model): @property def rights_badge(self): - my_rights=self.rights - if not my_rights: - return 'https://i.creativecommons.org/p/mark/1.0/88x31.png' - if my_rights == 'PD-US': - return 'https://i.creativecommons.org/p/mark/1.0/88x31.png' - elif my_rights == 'CC0': - return 'https://i.creativecommons.org/p/zero/1.0/88x31.png' - elif my_rights == 'CC BY': - return 'https://i.creativecommons.org/l/by/3.0/88x31.png' - elif my_rights == 'CC BY-NC-ND': - return 'https://i.creativecommons.org/l/by-nc-nd/3.0/88x31.png' - elif my_rights == 'CC BY-NC-SA': - return 'https://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png' - elif my_rights == 'CC BY-NC': - return 'https://i.creativecommons.org/l/by-nc/3.0/88x31.png' - elif my_rights == 'CC BY-SA': - return 'https://i.creativecommons.org/l/by-sa/3.0/88x31.png' - elif my_rights == 'CC BY-ND': - return 'https://i.creativecommons.org/l/by-nd/3.0/88x31.png' - else: - return '' + if self.rights is None : + return CCLicense.badge('PD-US') + return CCLicense.badge(self.rights) @classmethod def infer_provider(klass, url): diff --git a/core/tests.py b/core/tests.py index fdeaa71c..e8c920a9 100755 --- a/core/tests.py +++ b/core/tests.py @@ -350,7 +350,11 @@ class CampaignTests(TestCase): w = Work() w.save() c = Campaign(target=D('1000.00'), deadline=datetime(2013, 1, 1), work=w) + c.license = 'CC BY-NC' c.save() + self.assertEqual(c.license_url, 'http://creativecommons.org/licenses/by-nc/3.0/') + self.assertEqual(c.license_badge, 'https://i.creativecommons.org/l/by-nc/3.0/88x31.png') + def test_campaign_status(self): diff --git a/frontend/forms.py b/frontend/forms.py index ce5701c8..783a5464 100644 --- a/frontend/forms.py +++ b/frontend/forms.py @@ -241,7 +241,21 @@ def getManageCampaignForm ( instance, data=None, *args, **kwargs ): new_license = self.cleaned_data['license'] if self.instance: if self.instance.status == 'ACTIVE' and self.instance.license != new_license: - raise forms.ValidationError(_('The license for an ACTIVE campaign cannot be changed.')) + # should only allow change to a less restrictive license + if self.instance.license == 'CC BY-ND' and new_license in ['CC BY-NC-ND','CC BY-NC-SA','CC BY-NC']: + raise forms.ValidationError(_('The proposed license for an ACTIVE campaign may not add restrictions.')) + elif self.instance.license == 'CC BY' and new_license != 'CC0': + raise forms.ValidationError(_('The proposed license for an ACTIVE campaign may not add restrictions.')) + elif self.instance.license == 'CC BY-NC' and new_license in ['CC BY-NC-ND','CC BY-NC-SA','CC BY-SA','CC BY-ND']: + raise forms.ValidationError(_('The proposed license for an ACTIVE campaign may not add restrictions.')) + elif self.instance.license == 'CC BY-ND' and new_license in ['CC BY-NC-ND','CC BY-NC-SA','CC BY-SA','CC BY-NC']: + raise forms.ValidationError(_('The proposed license for an ACTIVE campaign may not add restrictions.')) + elif self.instance.license == 'CC BY-SA' and new_license in ['CC BY-NC-ND','CC BY-NC-SA','CC BY-ND','CC BY-NC']: + raise forms.ValidationError(_('The proposed license for an ACTIVE campaign may not add restrictions.')) + elif self.instance.license == 'CC BY-NC-SA' and new_license in ['CC BY-NC-ND','CC BY-ND']: + raise forms.ValidationError(_('The proposed license for an ACTIVE campaign may not add restrictions.')) + elif self.instance.license == 'CC0' : + raise forms.ValidationError(_('The proposed license for an ACTIVE campaign may not add restrictions.')) return new_license return ManageCampaignForm(instance = instance, data=data) diff --git a/frontend/templates/manage_campaign.html b/frontend/templates/manage_campaign.html index c6b3a38e..46c8d6b0 100644 --- a/frontend/templates/manage_campaign.html +++ b/frontend/templates/manage_campaign.html @@ -169,8 +169,9 @@ Please fix the following before launching your campaign: ${{ form.target.errors }}{{ form.target }}If your campaign succeeds, you will be offering your ebook under a {{ campaign.license }} license.
- {{ form.license.errors }} +If your campaign succeeds, you will be offering your ebook under a {{ campaign.license }} license.
+During a campaign, you may only change the license to remove restrictions. For more info on the licenses you can use, see Creative Commons: About the Licenses.
+ {{ form.license.errors }}{{ form.license }}The ending date of your campaign is {{ campaign.deadline }}. Your campaign will conclude on this date or when you meet your target price, whichever is earlier. You may not change the ending date of an active campaign.
{{ form.deadline.errors }} diff --git a/frontend/templates/press.html b/frontend/templates/press.html index e0b484ce..9ad28abf 100644 --- a/frontend/templates/press.html +++ b/frontend/templates/press.html @@ -47,7 +47,7 @@