From 6e71c276b582135228419d95174b7e7784d496b2 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Mon, 30 Jun 2014 18:33:04 +0100 Subject: bitbake: toaster: add project main edit page This is the first commit on the project main edit page. At this point we have: * the default settings for a newly created project * the ability to add targets * the ability to trigger a build command, and have the build executed Project layers now have an optional field, allowing for removal. Default meta, meta-yocto and meta-yocto-bsp layers cannot be optional. We add XHR calls for interactivity in the main page. (Bitbake rev: 4e438854120cbd10319df1b571ec93e334002325) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- ...layer_optional__add_field_projecttarget_task.py | 252 +++++++++++++++ bitbake/lib/toaster/orm/models.py | 8 +- .../lib/toaster/toastergui/static/css/default.css | 42 ++- bitbake/lib/toaster/toastergui/templates/base.html | 4 + .../lib/toaster/toastergui/templates/project.html | 356 +++++++++++++++++++++ bitbake/lib/toaster/toastergui/urls.py | 3 + bitbake/lib/toaster/toastergui/views.py | 105 +++++- 7 files changed, 748 insertions(+), 22 deletions(-) create mode 100644 bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py (limited to 'bitbake') diff --git a/bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py b/bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py new file mode 100644 index 0000000000..9e483f5dac --- /dev/null +++ b/bitbake/lib/toaster/orm/migrations/0012_auto__add_field_projectlayer_optional__add_field_projecttarget_task.py @@ -0,0 +1,252 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'ProjectLayer.optional' + db.add_column(u'orm_projectlayer', 'optional', + self.gf('django.db.models.fields.BooleanField')(default=True), + keep_default=False) + + # Adding field 'ProjectTarget.task' + db.add_column(u'orm_projecttarget', 'task', + self.gf('django.db.models.fields.CharField')(max_length=100, null=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'ProjectLayer.optional' + db.delete_column(u'orm_projectlayer', 'optional') + + # Deleting field 'ProjectTarget.task' + db.delete_column(u'orm_projecttarget', 'task') + + + models = { + u'orm.build': { + 'Meta': {'object_name': 'Build'}, + 'bitbake_version': ('django.db.models.fields.CharField', [], {'max_length': '50'}), + 'build_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'completed_on': ('django.db.models.fields.DateTimeField', [], {}), + 'cooker_log_path': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'distro': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'distro_version': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'errors_no': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'machine': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'outcome': ('django.db.models.fields.IntegerField', [], {'default': '2'}), + 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']", 'null': 'True'}), + 'started_on': ('django.db.models.fields.DateTimeField', [], {}), + 'timespent': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'warnings_no': ('django.db.models.fields.IntegerField', [], {'default': '0'}) + }, + u'orm.helptext': { + 'Meta': {'object_name': 'HelpText'}, + 'area': ('django.db.models.fields.IntegerField', [], {}), + 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'helptext_build'", 'to': u"orm['orm.Build']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'text': ('django.db.models.fields.TextField', [], {}) + }, + u'orm.layer': { + 'Meta': {'object_name': 'Layer'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'layer_index_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), + 'local_path': ('django.db.models.fields.FilePathField', [], {'max_length': '255'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'orm.layer_version': { + 'Meta': {'object_name': 'Layer_Version'}, + 'branch': ('django.db.models.fields.CharField', [], {'max_length': '50'}), + 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'layer_version_build'", 'to': u"orm['orm.Build']"}), + 'commit': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'layer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'layer_version_layer'", 'to': u"orm['orm.Layer']"}), + 'priority': ('django.db.models.fields.IntegerField', [], {}) + }, + u'orm.logmessage': { + 'Meta': {'object_name': 'LogMessage'}, + 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'lineno': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'message': ('django.db.models.fields.CharField', [], {'max_length': '240'}), + 'pathname': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), + 'task': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Task']", 'null': 'True', 'blank': 'True'}) + }, + u'orm.package': { + 'Meta': {'object_name': 'Package'}, + 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'installed_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100'}), + 'installed_size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'license': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Recipe']", 'null': 'True'}), + 'revision': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), + 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), + 'version': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}) + }, + u'orm.package_dependency': { + 'Meta': {'object_name': 'Package_Dependency'}, + 'dep_type': ('django.db.models.fields.IntegerField', [], {}), + 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'package_dependencies_target'", 'to': u"orm['orm.Package']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'package_dependencies_source'", 'to': u"orm['orm.Package']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']", 'null': 'True'}) + }, + u'orm.package_file': { + 'Meta': {'object_name': 'Package_File'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'buildfilelist_package'", 'to': u"orm['orm.Package']"}), + 'path': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), + 'size': ('django.db.models.fields.IntegerField', [], {}) + }, + u'orm.project': { + 'Meta': {'object_name': 'Project'}, + 'branch': ('django.db.models.fields.CharField', [], {'max_length': '50'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'short_description': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), + 'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user_id': ('django.db.models.fields.IntegerField', [], {'null': 'True'}) + }, + u'orm.projectlayer': { + 'Meta': {'object_name': 'ProjectLayer'}, + 'commit': ('django.db.models.fields.CharField', [], {'max_length': '254'}), + 'dirpath': ('django.db.models.fields.CharField', [], {'max_length': '254'}), + 'giturl': ('django.db.models.fields.CharField', [], {'max_length': '254'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'optional': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}) + }, + u'orm.projecttarget': { + 'Meta': {'object_name': 'ProjectTarget'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'task': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}) + }, + u'orm.projectvariable': { + 'Meta': {'object_name': 'ProjectVariable'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}), + 'value': ('django.db.models.fields.TextField', [], {'blank': 'True'}) + }, + u'orm.recipe': { + 'Meta': {'object_name': 'Recipe'}, + 'bugtracker': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'file_path': ('django.db.models.fields.FilePathField', [], {'max_length': '255'}), + 'homepage': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'layer_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'recipe_layer_version'", 'to': u"orm['orm.Layer_Version']"}), + 'license': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'summary': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'version': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}) + }, + u'orm.recipe_dependency': { + 'Meta': {'object_name': 'Recipe_Dependency'}, + 'dep_type': ('django.db.models.fields.IntegerField', [], {}), + 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'r_dependencies_depends'", 'to': u"orm['orm.Recipe']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'r_dependencies_recipe'", 'to': u"orm['orm.Recipe']"}) + }, + u'orm.target': { + 'Meta': {'object_name': 'Target'}, + 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image_size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'is_image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'license_manifest_path': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'orm.target_file': { + 'Meta': {'object_name': 'Target_File'}, + 'directory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'directory_set'", 'null': 'True', 'to': u"orm['orm.Target_File']"}), + 'group': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inodetype': ('django.db.models.fields.IntegerField', [], {}), + 'owner': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'path': ('django.db.models.fields.FilePathField', [], {'max_length': '100'}), + 'permission': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'size': ('django.db.models.fields.IntegerField', [], {}), + 'sym_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'symlink_set'", 'null': 'True', 'to': u"orm['orm.Target_File']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) + }, + u'orm.target_image_file': { + 'Meta': {'object_name': 'Target_Image_File'}, + 'file_name': ('django.db.models.fields.FilePathField', [], {'max_length': '254'}), + 'file_size': ('django.db.models.fields.IntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) + }, + u'orm.target_installed_package': { + 'Meta': {'object_name': 'Target_Installed_Package'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'buildtargetlist_package'", 'to': u"orm['orm.Package']"}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) + }, + u'orm.task': { + 'Meta': {'ordering': "('order', 'recipe')", 'unique_together': "(('build', 'recipe', 'task_name'),)", 'object_name': 'Task'}, + 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_build'", 'to': u"orm['orm.Build']"}), + 'cpu_usage': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '2'}), + 'disk_io': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'elapsed_time': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '6', 'decimal_places': '2'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'line_number': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'logfile': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), + 'message': ('django.db.models.fields.CharField', [], {'max_length': '240'}), + 'order': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'outcome': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), + 'path_to_sstate_obj': ('django.db.models.fields.FilePathField', [], {'max_length': '500', 'blank': 'True'}), + 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'build_recipe'", 'to': u"orm['orm.Recipe']"}), + 'script_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'source_url': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), + 'sstate_checksum': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'sstate_result': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'task_executed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'task_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'work_directory': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}) + }, + u'orm.task_dependency': { + 'Meta': {'object_name': 'Task_Dependency'}, + 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_dependencies_depends'", 'to': u"orm['orm.Task']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'task': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_dependencies_task'", 'to': u"orm['orm.Task']"}) + }, + u'orm.variable': { + 'Meta': {'object_name': 'Variable'}, + 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'variable_build'", 'to': u"orm['orm.Build']"}), + 'changed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'human_readable_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'variable_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'variable_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}) + }, + u'orm.variablehistory': { + 'Meta': {'object_name': 'VariableHistory'}, + 'file_name': ('django.db.models.fields.FilePathField', [], {'max_length': '255'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'line_number': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'operation': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'variable': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vhistory'", 'to': u"orm['orm.Variable']"}) + } + } + + complete_apps = ['orm'] \ No newline at end of file diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 9b7387a8af..f19a4370c8 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -37,13 +37,15 @@ class ProjectManager(models.Manager): name = "meta", giturl = "git://git.yoctoproject.org/poky", commit = branch, - dirpath = "meta") + dirpath = "meta", + optional = False) ProjectLayer.objects.create(project = prj, name = "meta-yocto", giturl = "git://git.yoctoproject.org/poky", commit = branch, - dirpath = "meta-yocto") + dirpath = "meta-yocto", + optional = False) return prj @@ -116,6 +118,7 @@ class Build(models.Model): class ProjectTarget(models.Model): project = models.ForeignKey(Project) target = models.CharField(max_length=100) + task = models.CharField(max_length=100, null=True) @python_2_unicode_compatible class Target(models.Model): @@ -392,6 +395,7 @@ class ProjectLayer(models.Model): giturl = models.CharField(max_length = 254) commit = models.CharField(max_length = 254) dirpath = models.CharField(max_length = 254) + optional = models.BooleanField(default = True) class Layer(models.Model): name = models.CharField(max_length=100) diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 2c283feccf..778d8b8456 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -116,17 +116,31 @@ select { width: auto; } /* make tables Chrome-happy (me, not so much) */ #otable { table-layout: fixed; word-wrap: break-word; } - - - - - - - - - - - - - - +/* Configuration styles */ +.icon-trash { color: #B94A48; font-size: 16px; padding-left: 2px; } +.icon-trash:hover { color: #943A38; text-decoration: none; cursor: pointer; } +.icon-pencil, .icon-download-alt { font-size: 16px; color: #0088CC; padding-left: 2px; } +.icon-pencil:hover, .icon-download-alt:hover { color: #005580; text-decoration: none; cursor: pointer; } +.configuration-list li { line-height: 35px; font-size: 21px; font-weight: 200; } +.configuration-list { font-size: 16px; margin-bottom: 1.5em; } +.configuration-list i { font-size: 16px; } +/*.configuration-layers { height: 135px; overflow: scroll; }*/ +.counter { font-weight: normal; } +.well-alert { background-color: #FCF8E3; border: 1px solid #FBEED5; border-radius: 4px; } +.well-alert > .lead { color: #C09853; padding-bottom: .75em; } +.configuration-alert { margin-bottom: 0px; padding: 8px 14px; } +.configuration-alert p { margin-bottom: 0px; } +fieldset { padding-left: 19px; } +.project-form { margin-top: 10px; } +.add-layers .btn-block + .btn-block { margin-top: 0px; } +input.huge { font-size: 17.5px; padding: 11px 19px; } +.build-form { margin-bottom: 0px; padding-left: 20px; } +a code { color: #0088CC; } +a code:hover { color: #005580; } +.localconf { font-size: 17.5px; margin-top: 40px; } +.localconf code { font-size: 17.5px; } +#add-layer-dependencies { margin-top: 5px; } +.artifact { width: 9em; } +.control-group { margin-bottom: 0px; } +#project-details form { margin: 0px; } +dd form { margin: 10px 0 0 0; } diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index 1407d641d5..9ef249aab3 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html @@ -65,6 +65,10 @@ function reload_params(params) {
    +{% for prj in projects %} +
  • {{prj.name}}
    • +{% endfor %} +
  • Clone project
  • Export project
  • Import project
    • diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 71adb54431..c859f6bcd1 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -3,4 +3,360 @@ {% load humanize %} {% block pagecontent %} + + + +
    +

    + {{project.name}} + {% if project.build_set.all.count == 0 %} + No builds yet + {% else %} + {{project.build_set.all.count}} builds + {% endif %} +

    +
    + + +
    + + +
    + + +
    + + +
    + + + + + + + + {% if builds|length > 0 or buildrequests|length > 0 %} +

    Recent Builds

    + +
    + {% for br in buildrequests %} +
    +
    +
    + + {{br.0.brtarget_set.all.0.target}} {%if br.brtarget_set.all.count > 1%}(+ {{br.brtarget_set.all.count|add:"-1"}}){%endif%} {{br.1.machine.value}} (Created {{br.0.created}}) + +
    +
    + {{br.0.get_state_display}} +
    +
    +{% if br.state == br.REQ_FAILED%} + {% for bre in br.0.brerror_set.all %} {{bre.errmsg}} ({{bre.errtype}})
    {{bre.traceback}}{%endfor%} +{%endif%} +
    + +
    +
    + + {% endfor %} + +
    + + + + + {% for build in builds %} +
    +
    +
    + {%if build.outcome == build.SUCCEEDED%}{%elif build.outcome == build.FAILED%}{%else%}{%endif%} + {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} + + {% endif %} + 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}}) + {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} + + {% endif %} +
    + {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} +
    + {% if build.errors_no %} + {{build.errors_no}} error{{build.errors_no|pluralize}} + {% endif %} +
    +
    + {% if build.warnings_no %} + {{build.warnings_no}} warning{{build.warnings_no|pluralize}} + {% endif %} +
    +
    + Build time: {{ build.timespent|sectohms }} +
    + {%endif%}{%if build.outcome == build.IN_PROGRESS %} +
    +
    +
    +
    +
    +
    ETA: in {{build.eta|naturaltime}}
    + {%endif%} +
    +
    + {% endfor %} + + {%endif%} + +

    Project configuration

    + +
    + +
    +

    + Add layers + +

    +
    +
    + + +
    + + + +

    Import your layer | View all layers

    +
    + +

    + Added layers + {{project.projectlayer_set.count}} + +

    +
      + {% for pl in project.projectlayer_set.all %} +
    • + {{pl.name}} ({{pl.giturl}}) + {% if pl.optional %} + + {% endif %} +
      • + {% endfor %} +
    +
    + +
    +

    + Add targets + +

    +
    +
    + + +
    + +

    View all targets

    +
    +

    + Added targets + {{project.projecttarget_set.count}} +

    + +
    + +
    +

    + Set machine + +

    +

    + {{machine}} + +

    +

    + Set distro + +

    +

    + {{distro}} + +

    +

    + Edit the local.conf file + +

    +
    +
    + +

    Project details

    + +
    +

    Project name

    +

    + {{project.name}} + +

    +

    Project owner

    +

    + {{puser.username}} + +

    +

    Owner's email

    +

    + {{puser.email}} + +

    +

    Yocto Project version

    +

    + {{project.branch}} - {{project.short_description}} + +

    +
    {% endblock %} diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index 0d7a4c35fa..7c4f894b9c 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py @@ -69,6 +69,9 @@ urlpatterns = patterns('toastergui.views', # project URLs url(r'^newproject/$', 'newproject', name='newproject'), url(r'^project/(?P\d+)/$', 'project', name='project'), + url(r'^xhr_projectbuild/(?P\d+)/$', 'xhr_projectbuild', name='xhr_projectbuild'), + url(r'^xhr_projectedit/(?P\d+)/$', 'xhr_projectedit', name='xhr_projectedit'), + # default redirection url(r'^$', RedirectView.as_view( url= 'builds/')), diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index f9e8e51688..bd65c08b06 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -30,7 +30,7 @@ from orm.models import Target_Installed_Package, Target_File, Target_Image_File from django.views.decorators.cache import cache_control from django.core.urlresolvers import reverse from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from django.http import HttpResponseBadRequest +from django.http import HttpResponseBadRequest, HttpResponseNotFound from django.utils import timezone from datetime import timedelta from django.utils import formats @@ -1761,8 +1761,6 @@ def image_information_dir(request, build_id, target_id, packagefile_id): import toastermain.settings -def managedcontextprocessor(request): - return { "MANAGED" : toastermain.settings.MANAGED } # we have a set of functions if we're in managed mode, or @@ -1773,7 +1771,8 @@ if toastermain.settings.MANAGED: from django.contrib.auth import authenticate, login from django.contrib.auth.decorators import login_required - from orm.models import Project + from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable + from bldcontrol.models import BuildRequest import traceback @@ -1831,19 +1830,113 @@ if toastermain.settings.MANAGED: else: context['alert'] = str(e) return render(request, template, context) + raise Exception("Invalid HTTP method for this page") # Shows the edit project page def project(request, pid): template = "project.html" - context = {} + try: + prj = Project.objects.get(id = pid) + except Project.DoesNotExist: + return HttpResponseNotFound("

    Project id " + pid + " is unavailable

    ") + + try: + puser = User.objects.get(id = prj.user_id) + except User.DoesNotExist: + puser = None + + context = { + "project" : prj, + #"buildrequests" : prj.buildrequest_set.filter(state=BuildRequest.REQ_QUEUED), + "buildrequests" : map(lambda x: (x, {"machine" : x.brvariable_set.filter(name="MACHINE")[0]}), prj.buildrequest_set.order_by("-pk")), + "builds" : prj.build_set.all(), + "puser": puser, + } + try: + context["machine"] = prj.projectvariable_set.get(name="MACHINE").value + except ProjectVariable.DoesNotExist: + context["machine"] = "-- not set yet" + + try: + context["distro"] = prj.projectvariable_set.get(name="DISTRO").value + except ProjectVariable.DoesNotExist: + context["distro"] = "-- not set yet" + + return render(request, template, context) + import json + + def xhr_projectbuild(request, pid): + try: + if request.method != "POST": + raise BadParameterException("invalid method") + prj = Project.objects.get(id = pid) + + if prj.projecttarget_set.count() == 0: + raise BadParameterException("no targets selected") + + br = prj.schedule_build() + return HttpResponse(json.dumps({"error":"ok", + "brtarget" : map(lambda x: x.target, br.brtarget_set.all()), + "machine" : br.brvariable_set.get(name="MACHINE").value, + + }), content_type = "application/json") + except Exception as e: + return HttpResponse(json.dumps({"error":str(e) + "\n" + traceback.format_exc()}), content_type = "application/json") + + def xhr_projectedit(request, pid): + try: + prj = Project.objects.get(id = pid) + # add targets + if 'targetAdd' in request.POST: + for t in request.POST['targetAdd'].strip().split(" "): + if ":" in t: + target, task = t.split(":") + else: + target = t + task = "" + + pt, created = ProjectTarget.objects.get_or_create(project = prj, target = target, task = task) + # remove targets + if 'targetDel' in request.POST: + for t in request.POST['targetDel'].strip().split(" "): + pt = ProjectTarget.objects.get(pk = int(t)).delete() + + # add layers + + # remove layers + + # return all project settings + return HttpResponse(json.dumps( { + "error": "ok", + "layers": map(lambda x: (x.name, x.giturl), prj.projectlayer_set.all()), + "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()), + "variables": map(lambda x: (x.name, x.value), prj.projectvariable_set.all()), + }), content_type = "application/json") + + except Exception as e: + return HttpResponse(json.dumps({"error":str(e) + "\n" + traceback.format_exc()}), content_type = "application/json") + else: # these are pages that are NOT available in interactive mode + def managedcontextprocessor(request): + return { + "projects": [], + "MANAGED" : toastermain.settings.MANAGED + } + def newproject(request): raise Exception("page not available in interactive mode") - def project(request): + def project(request, pid): + raise Exception("page not available in interactive mode") + + def xhr_projectbuild(request, pid): raise Exception("page not available in interactive mode") + + def xhr_projectedit(request, pid): + raise Exception("page not available in interactive mode") + -- cgit v1.2.3-54-g00ecf