diff --git a/layerindex/forms.py b/layerindex/forms.py index bc0df9d..29d689f 100644 --- a/layerindex/forms.py +++ b/layerindex/forms.py @@ -49,7 +49,7 @@ LayerMaintainerFormSet = inlineformset_factory(LayerBranch, LayerMaintainer, for class EditLayerForm(forms.ModelForm): # Additional form fields vcs_subdir = forms.CharField(label='Repository subdirectory', max_length=40, required=False, help_text='Subdirectory within the repository where the layer is located, if not in the root (usually only used if the repository contains more than one layer)') - deps = forms.ModelMultipleChoiceField(label='Other layers this layer depends upon', queryset=LayerItem.objects.filter(classic=False), required=False) + deps = forms.ModelMultipleChoiceField(label='Other layers this layer depends upon', queryset=LayerItem.objects.filter(comparison=False), required=False) captcha = CaptchaField(label='Verification', help_text='Please enter the letters displayed for verification purposes', error_messages={'invalid':'Incorrect entry, please try again'}) class Meta: @@ -197,7 +197,7 @@ class AdvancedRecipeSearchForm(forms.Form): field = forms.ChoiceField(choices=FIELD_CHOICES) match_type = forms.ChoiceField(choices=MATCH_TYPE_CHOICES) value = forms.CharField(max_length=255, required=False) - layer = forms.ModelChoiceField(queryset=LayerItem.objects.filter(classic=False).filter(status__in=['P', 'X']).order_by('name'), empty_label="(any)", required=False) + layer = forms.ModelChoiceField(queryset=LayerItem.objects.filter(comparison=False).filter(status__in=['P', 'X']).order_by('name'), empty_label="(any)", required=False) class RecipeChangesetForm(forms.ModelForm): @@ -234,7 +234,7 @@ class ClassicRecipeSearchForm(forms.Form): q = forms.CharField(label='Keyword', max_length=255, required=False) category = forms.CharField(max_length=255, required=False) - oe_layer = forms.ModelChoiceField(label='OE Layer', queryset=LayerItem.objects.filter(classic=False).filter(status__in=['P', 'X']).order_by('name'), empty_label="(any)", required=False) + oe_layer = forms.ModelChoiceField(label='OE Layer', queryset=LayerItem.objects.filter(comparison=False).filter(status__in=['P', 'X']).order_by('name'), empty_label="(any)", required=False) has_patches = forms.ChoiceField(label='Patches', choices=PATCH_CHOICES, required=False) cover_status = forms.ChoiceField(label='Status', choices=COVER_STATUS_CHOICES, required=False) cover_verified = forms.ChoiceField(label='Verified', choices=VERIFIED_CHOICES, required=False) diff --git a/layerindex/migrations/0019_layeritem_classic_comparison.py b/layerindex/migrations/0019_layeritem_classic_comparison.py new file mode 100644 index 0000000..64c1e7a --- /dev/null +++ b/layerindex/migrations/0019_layeritem_classic_comparison.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.12 on 2018-05-15 05:25 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('layerindex', '0018_layerrecipeextraurl'), + ] + + operations = [ + migrations.RenameField( + model_name='layeritem', + old_name='classic', + new_name='comparison', + ), + migrations.AlterField( + model_name='layeritem', + name='comparison', + field=models.BooleanField(default=False, help_text='Is this a comparison layer?', verbose_name='Comparison'), + ), + ] diff --git a/layerindex/models.py b/layerindex/models.py index 4f2b2c8..e3d2776 100644 --- a/layerindex/models.py +++ b/layerindex/models.py @@ -126,7 +126,7 @@ class LayerItem(models.Model): usage_url = models.CharField('Usage web page URL', max_length=255, blank=True, help_text='URL of a web page with more information about the layer and how to use it, if any (or path to file within repository)') mailing_list_url = models.URLField('Mailing list URL', blank=True, help_text='URL of the info page for a mailing list for discussing the layer, if any') index_preference = models.IntegerField('Preference', default=0, help_text='Number used to find preferred recipes in recipe search results (higher number is greater preference)') - classic = models.BooleanField('Classic', default=False, help_text='Is this OE-Classic?') + comparison = models.BooleanField('Comparison', default=False, help_text='Is this a comparison layer?') updated = models.DateTimeField(auto_now=True) diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py index 2224521..1bf6519 100755 --- a/layerindex/tools/import_classic.py +++ b/layerindex/tools/import_classic.py @@ -119,7 +119,7 @@ def main(): layer.vcs_web_url = 'http://cgit.openembedded.org/openembedded' layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%' layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%' - layer.classic = True + layer.comparison = True layer.save() layerbranch = layer.get_layerbranch(options.branch) diff --git a/layerindex/update.py b/layerindex/update.py index c0a9f88..5c9f6e7 100755 --- a/layerindex/update.py +++ b/layerindex/update.py @@ -194,7 +194,7 @@ def main(): # We deliberately exclude status == 'X' ("no update") here - layerquery_all = LayerItem.objects.filter(classic=False).filter(status='P') + layerquery_all = LayerItem.objects.filter(comparison=False).filter(status='P') if layerquery_all.count() == 0: logger.info("No published layers to update") sys.exit(1) @@ -207,11 +207,11 @@ def main(): update_bitbake = True layers.remove('bitbake') for layer in layers: - layerquery = LayerItem.objects.filter(classic=False).filter(name=layer) + layerquery = LayerItem.objects.filter(comparison=False).filter(name=layer) if layerquery.count() == 0: logger.error('No layers matching specified query "%s"' % layer) sys.exit(1) - layerquery = LayerItem.objects.filter(classic=False).filter(name__in=layers) + layerquery = LayerItem.objects.filter(comparison=False).filter(name__in=layers) else: layerquery = layerquery_all update_bitbake = True @@ -255,7 +255,7 @@ def main(): if not options.nofetch: # Make sure oe-core is fetched since recipe parsing requires it - layerquery_core = LayerItem.objects.filter(classic=False).filter(name=settings.CORE_LAYER_NAME) + layerquery_core = LayerItem.objects.filter(comparison=False).filter(name=settings.CORE_LAYER_NAME) if layerquery_core in layerquery: layerquery_fetch = list(layerquery) else: diff --git a/layerindex/views.py b/layerindex/views.py index 93eae8e..0c60420 100644 --- a/layerindex/views.py +++ b/layerindex/views.py @@ -39,7 +39,7 @@ from django.db.models.signals import pre_save def edit_layernote_view(request, template_name, slug, pk=None): layeritem = get_object_or_404(LayerItem, name=slug) - if layeritem.classic: + if layeritem.comparison: raise Http404 if not (request.user.is_authenticated() and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))): raise PermissionDenied @@ -65,7 +65,7 @@ def edit_layernote_view(request, template_name, slug, pk=None): def delete_layernote_view(request, template_name, slug, pk): layeritem = get_object_or_404(LayerItem, name=slug) - if layeritem.classic: + if layeritem.comparison: raise Http404 if not (request.user.is_authenticated() and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))): raise PermissionDenied @@ -82,7 +82,7 @@ def delete_layernote_view(request, template_name, slug, pk): def delete_layer_view(request, template_name, slug): layeritem = get_object_or_404(LayerItem, name=slug) - if layeritem.classic: + if layeritem.comparison: raise Http404 if not (request.user.is_authenticated() and request.user.has_perm('layerindex.publish_layer') and layeritem.status == 'N'): raise PermissionDenied @@ -102,7 +102,7 @@ def edit_layer_view(request, template_name, branch='master', slug=None): if slug: # Edit mode layeritem = get_object_or_404(LayerItem, name=slug) - if layeritem.classic: + if layeritem.comparison: raise Http404 if not (request.user.is_authenticated() and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))): raise PermissionDenied @@ -118,7 +118,7 @@ def edit_layer_view(request, template_name, branch='master', slug=None): # Submit mode layeritem = LayerItem() layerbranch = LayerBranch(layer=layeritem, branch=branchobj) - deplistlayers = LayerItem.objects.filter(classic=False).order_by('name') + deplistlayers = LayerItem.objects.filter(comparison=False).order_by('name') if request.method == 'POST': last_vcs_url = layeritem.vcs_url @@ -303,7 +303,7 @@ def publish_view(request, name): def _statuschange(request, name, newstatus): w = get_object_or_404(LayerItem, name=name) - if w.classic: + if w.comparison: raise Http404 if w.status != newstatus: w.change_status(newstatus, request.user.username) @@ -353,7 +353,7 @@ class LayerDetailView(DetailView): res = super(LayerDetailView, self).dispatch(request, *args, **kwargs) l = self.get_object() if l: - if l.classic: + if l.comparison: raise Http404 if l.status == 'N': if not (request.user.is_authenticated() and request.user.has_perm('layerindex.publish_layer')):