[Blends-commit] [SCM] website branch, master, updated. cadddb8e70138879df19411f75dff46c0fa4b929

[Andreas Tille]

The following commit has been merged in the master branch:
commit cadddb8e70138879df19411f75dff46c0fa4b929
Author: Andreas Tille <tille at debian.org>
Date:   Sat Dec 26 22:50:08 2015 +0100

    Consume inst values of popcon to result set

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 0d692fd..0512a5c 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -317,7 +317,7 @@ query = """PREPARE query_pkgs (text[],text[]) AS
           enhanced text[],
           releases text[], versions text[], architectures text[],
 	  unstable_upstream text, unstable_parsed_version text, unstable_status text,
-          vote int, recent int, -- popcon
+          vote int, recent int, insts int, -- popcon
           debtags text[],
           screenshot_versions text[], image text[], icon text[],
           year    text,
@@ -1641,6 +1641,7 @@ class TaskDependencies:
 
                 dep.popcon['vote']   = row['vote']
                 dep.popcon['recent'] = row['recent']
+                dep.popcon['insts'] = row['insts']
 
                 # Debtags as sorted list of dict fields
                 if row['debtags']:
diff --git a/webtools_py3/blendstasktools_udd.py b/webtools_py3/blendstasktools_udd.py
index 1601b7a..cadccd2 100644
--- a/webtools_py3/blendstasktools_udd.py
+++ b/webtools_py3/blendstasktools_udd.py
@@ -303,7 +303,7 @@ query = """PREPARE query_pkgs (text[],text[]) AS
           enhanced text[],
           releases text[], versions text[], architectures text[],
       unstable_upstream text, unstable_parsed_version text, unstable_status text,
-          vote int, recent int, -- popcon
+          vote int, recent int, insts int, -- popcon
           debtags text[],
           screenshot_versions text[], image text[], icon text[],
           year    text,
@@ -1183,6 +1183,8 @@ class TaskDependencies:
                 dep.popcon['vote']   = row['vote']
             if 'recent' in row:
                 dep.popcon['recent'] = row['recent']
+            if 'insts' in row:
+                dep.popcon['insts'] = row['insts']
                            
             # Debtags as sorted list of dict fields
             if 'debtags' in row:

-- 
Static and dynamic websites for Debian Pure Blends