From 5b8fd8cb103f31ef0d67c0fd4bbedfec0988c6af Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 13 Jan 2009 20:00:16 +0000 Subject: Add support for alternate VCS backends git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5023 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Reports/reports/fixtures/initial_version.xml | 4 ++++ src/lib/Server/Reports/reports/models_new.py | 2 +- src/lib/Server/Reports/reports/models_old.py | 2 +- src/lib/Server/Reports/reports/templates/clients/client-nodebox.html | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Reports/reports') diff --git a/src/lib/Server/Reports/reports/fixtures/initial_version.xml b/src/lib/Server/Reports/reports/fixtures/initial_version.xml index 9edb8fe57..4fc05b7af 100644 --- a/src/lib/Server/Reports/reports/fixtures/initial_version.xml +++ b/src/lib/Server/Reports/reports/fixtures/initial_version.xml @@ -20,4 +20,8 @@ 10 2008-08-22 11:28:50 + + 11 + 2009-01-13 12:26:10 + diff --git a/src/lib/Server/Reports/reports/models_new.py b/src/lib/Server/Reports/reports/models_new.py index 3b1a005da..c8f649089 100644 --- a/src/lib/Server/Reports/reports/models_new.py +++ b/src/lib/Server/Reports/reports/models_new.py @@ -111,7 +111,7 @@ class Interaction(models.Model): client = models.ForeignKey(Client, related_name="interactions",) timestamp = models.DateTimeField()#Timestamp for this record state = models.CharField(max_length=32)#good/bad/modified/etc - repo_revision = models.IntegerField()#repo revision at time of interaction + repo_rev_code = models.CharField(max_length=64)#repo revision at time of interaction client_version = models.CharField(max_length=32)#Client Version goodcount = models.IntegerField()#of good config-items totalcount = models.IntegerField()#of total config-items diff --git a/src/lib/Server/Reports/reports/models_old.py b/src/lib/Server/Reports/reports/models_old.py index a45fb0d30..aee66fd7d 100644 --- a/src/lib/Server/Reports/reports/models_old.py +++ b/src/lib/Server/Reports/reports/models_old.py @@ -111,7 +111,7 @@ class Interaction(models.Model): client = models.ForeignKey(Client, related_name="interactions", core=True) timestamp = models.DateTimeField()#Timestamp for this record state = models.CharField(maxlength=32)#good/bad/modified/etc - repo_revision = models.IntegerField()#repo revision at time of interaction + repo_rev_code = models.CharField(maxlength=64)#repo revision at time of interaction client_version = models.CharField(maxlength=32)#Client Version goodcount = models.IntegerField()#of good config-items totalcount = models.IntegerField()#of total config-items diff --git a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html index daa8bb245..5aae03c30 100644 --- a/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html +++ b/src/lib/Server/Reports/reports/templates/clients/client-nodebox.html @@ -9,7 +9,7 @@

Node: {{client.name}}

- {% if interaction.repo_revision %}Revision: {{interaction.repo_revision}}{% endif %} + {% if interaction.repo_rev_code %}Revision: {{interaction.repo_rev_code}}{% endif %}
 
-- cgit v1.2.3-1-g7c22