update strings

awx/main/models/projects.py

@@ -7,6 +7,9 @@ import os
 import re
 import urlparse
 
+# JSONField
+from jsonfield import JSONField
+
 # Django
 from django.conf import settings
 from django.db import models
@@ -106,6 +109,10 @@ class ProjectOptions(models.Model):
         default=None,
         on_delete=models.SET_NULL,
     )
+    timeout = models.PositiveIntegerField(
+        blank=True,
+        default=0,
+    )
 
     def clean_scm_type(self):
         return self.scm_type or ''
@@ -118,10 +125,10 @@ class ProjectOptions(models.Model):
             scm_url = update_scm_url(self.scm_type, scm_url,
                                      check_special_cases=False)
         except ValueError as e:
-            raise ValidationError((e.args or ('Invalid SCM URL.',))[0])
+            raise ValidationError((e.args or (_('Invalid SCM URL.'),))[0])
         scm_url_parts = urlparse.urlsplit(scm_url)
         if self.scm_type and not any(scm_url_parts):
-            raise ValidationError('SCM URL is required.')
+            raise ValidationError(_('SCM URL is required.'))
         return unicode(self.scm_url or '')
 
     def clean_credential(self):
@@ -130,7 +137,7 @@ class ProjectOptions(models.Model):
         cred = self.credential
         if cred:
             if cred.kind != 'scm':
-                raise ValidationError("Credential kind must be 'scm'.")
+                raise ValidationError(_("Credential kind must be 'scm'."))
             try:
                 scm_url = update_scm_url(self.scm_type, self.scm_url,
                                          check_special_cases=False)
@@ -145,7 +152,7 @@ class ProjectOptions(models.Model):
                     update_scm_url(self.scm_type, self.scm_url, scm_username,
                                    scm_password)
                 except ValueError as e:
-                    raise ValidationError((e.args or ('Invalid credential.',))[0])
+                    raise ValidationError((e.args or (_('Invalid credential.'),))[0])
             except ValueError:
                 pass
         return cred
@@ -223,6 +230,23 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
         blank=True,
     )
 
+    scm_revision = models.CharField(
+        max_length=1024,
+        blank=True,
+        default='',
+        editable=False,
+        verbose_name=_('SCM Revision'),
+        help_text=_('The last revision fetched by a project update'),
+    )
+
+    playbook_files = JSONField(
+        blank=True,
+        default=[],
+        editable=False,
+        verbose_name=_('Playbook Files'),
+        help_text=_('List of playbooks found in the project'),
+    )
+
     admin_role = ImplicitRoleField(parent_role=[
         'organization.admin_role',
         'singleton:' + ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
@@ -251,7 +275,7 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
     def _get_unified_job_field_names(cls):
         return ['name', 'description', 'local_path', 'scm_type', 'scm_url',
                 'scm_branch', 'scm_clean', 'scm_delete_on_update',
-                'credential', 'schedule']
+                'credential', 'schedule', 'timeout']
 
     def save(self, *args, **kwargs):
         new_instance = not bool(self.pk)
@@ -294,10 +318,6 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
             # inherit the child job status on failure
             elif self.last_job_failed:
                 return self.last_job.status
-            # Even on a successful child run, a missing project path overides
-            # the successful status
-            elif not self.get_project_path():
-                return 'missing'
             # Return the successful status
             else:
                 return self.last_job.status
@@ -389,6 +409,12 @@ class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin):
         editable=False,
     )
 
+    job_type = models.CharField(
+        max_length=64,
+        choices=PROJECT_UPDATE_JOB_TYPE_CHOICES,
+        default='check',
+    )
+
     @classmethod
     def _get_parent_field_name(cls):
         return 'project'