Hacky version of fitting spec support

.gitignore

@@ -102,6 +102,9 @@ ENV/
 # Rope project settings
 .ropeproject
 
+# PyCharm files
+.idea/
+
 # mkdocs documentation
 /site
 
@@ -113,5 +116,3 @@ weblab/data/
 
 # media directory
 weblab/media/
-
-weblab/\.idea/

weblab/config/settings/dev.py

@@ -5,7 +5,7 @@
 
 
 DEBUG = True
-LOG_DEBUG = DEBUG
+LOG_DEBUG = False
 
 ALLOWED_HOSTS = ['*']
 

weblab/core/combine.py

@@ -90,9 +90,9 @@ def xml_doc(self):
                 root,
                 '{%s}content' % MANIFEST_NS,
                 **{
-                    ('{%s}location' % MANIFEST_NS): path,
-                    ('{%s}format' % MANIFEST_NS): fmt,
-                    ('{%s}master' % MANIFEST_NS): 'true' if is_master else 'false'
+                    'location': path,
+                    'format': fmt,
+                    'master': 'true' if is_master else 'false'
                 }
             )
 

weblab/datasets/templatetags/datasets.py

@@ -8,7 +8,7 @@
 @register.simple_tag(takes_context=True)
 def can_create_dataset(context):
     user = context['user']
-    return user.has_perm('datasets.create_dataset_experiment')
+    return user.has_perm('datasets.create_dataset')
 
 
 @register.filter

weblab/entities/forms.py

@@ -41,7 +41,12 @@ class Meta:
 class ProtocolEntityForm(EntityForm):
     class Meta:
         model = ProtocolEntity
-        fields = ['name']
+        fields = ['name', 'is_fitting_spec']
+
+    is_fitting_spec = forms.BooleanField(
+        label='This protocol is a parameter fitting specification',
+        widget=forms.CheckboxInput(attrs={'class': 'inline'}),
+        required=False)
 
 
 class EntityVersionForm(forms.Form):
@@ -57,15 +62,14 @@ class EntityVersionForm(forms.Form):
         label='Description of this version',
         widget=forms.Textarea)
     rerun_expts = forms.BooleanField(
-        label='',
-        help_text='Re-run experiments involving the previous version of this %s',
+        label='Re-run experiments involving the previous version of this %s',
         widget=forms.CheckboxInput(attrs={'class': 'inline'}),
         required=False)
 
     def __init__(self, *args, **kwargs):
         entity_type = kwargs.pop('entity_type')
         super().__init__(*args, **kwargs)
-        self.fields['rerun_expts'].help_text = self.fields['rerun_expts'].help_text % entity_type
+        self.fields['rerun_expts'].label = self.fields['rerun_expts'].label % entity_type
 
 
 class EntityChangeVisibilityForm(UserKwargModelFormMixin, forms.Form):

weblab/entities/migrations/0014_entity_is_fitting_spec.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-05-30 13:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def set_initial_fitting_specs(apps, schema_editor):
+    Entity = apps.get_model('entities', 'Entity')
+    Entity.objects.filter(name__startswith='Fit ').update(is_fitting_spec=True)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0013_auto_20190408_1354'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='entity',
+            name='is_fitting_spec',
+            field=models.BooleanField(
+                default=False,
+                help_text='This protocol is a parameter fitting specification'),
+        ),
+        migrations.RunPython(set_initial_fitting_specs, migrations.RunPython.noop),
+    ]

weblab/entities/models.py

@@ -37,6 +37,11 @@ class Entity(UserCreatedModelMixin, models.Model):
 
     name = models.CharField(validators=[MinLengthValidator(2)], max_length=255)
 
+    is_fitting_spec = models.BooleanField(
+        default=False,
+        help_text="This protocol is a parameter fitting specification",
+    )
+
     class Meta:
         ordering = ['name']
         unique_together = ('entity_type', 'name', 'author')

weblab/entities/templatetags/entities.py

@@ -189,3 +189,10 @@ def can_delete_entity(context, entity):
 def can_manage_entity(context, entity):
     user = context['user']
     return entity.is_managed_by(user)
+
+
+@register.filter
+def url_run_experiments(entity, commit):
+    last_tag = _url_friendly_label(entity, commit)
+    args = [entity.entity_type, entity.id, last_tag]
+    return reverse('entities:runexperiments', args=args)

weblab/entities/tests/test_templatetags.py

@@ -123,3 +123,16 @@ def test_url_friendly_label(model_with_version, helpers):
     commit3 = helpers.add_version(model_with_version)
     model_with_version.repo.tag('latest')
     assert entity_tags._url_friendly_label(model_with_version, commit3) == commit3.hexsha
+
+
+@pytest.mark.django_db
+def test_url_runexperiments(model_with_version, protocol_with_version):
+    model = model_with_version
+    model_commit = model.repo.latest_commit
+    assert (entity_tags.url_run_experiments(model, model_commit) ==
+            '/entities/models/%d/versions/%s/runexperiments' % (model.pk, model_commit.hexsha))
+
+    protocol = protocol_with_version
+    protocol_commit = protocol.repo.latest_commit
+    assert (entity_tags.url_run_experiments(protocol, protocol_commit) ==
+            '/entities/protocols/%d/versions/%s/runexperiments' % (protocol.pk, protocol_commit.hexsha))