diff options
| author | eliott <eliott@cactuswax.net> | 2008-04-05 22:27:10 +0200 |
|---|---|---|
| committer | eliott <eliott@cactuswax.net> | 2008-04-05 22:27:10 +0200 |
| commit | 5f48dda94b593feefd906a7aa495427c870d6db9 (patch) | |
| tree | 4d3fcd300f9e747b77ae41922ec943f1e9939faa | |
| parent | 1bac739c5cbf13163072d6929c43f686c4a828c9 (diff) | |
| download | archweb-5f48dda94b593feefd906a7aa495427c870d6db9.tar.gz archweb-5f48dda94b593feefd906a7aa495427c870d6db9.tar.xz | |
Fix for FS#9554
Backported and modified from 'master'
| -rw-r--r-- | devel/views.py | 5 | ||||
| -rw-r--r-- | main/models.py | 20 | ||||
| -rw-r--r-- | templates/devel/index.html | 4 |
3 files changed, 22 insertions, 7 deletions
diff --git a/devel/views.py b/devel/views.py index f243d7d..cbeaf15 100644 --- a/devel/views.py +++ b/devel/views.py @@ -36,7 +36,10 @@ def index(request): 'name': arch_name, 'count': Package.objects.filter(arch__exact = arch).count(), 'flagged': Package.objects.filter( - arch__exact = arch).filter(needupdate=True).count() + arch__exact = arch).filter(needupdate=True).count(), + 'flagnotest': Package.objects.filter( + arch__exact = arch).filter(needupdate=True).exclude( + repo=Package.REPOS['testing']).count() }) repo_stats = [] diff --git a/main/models.py b/main/models.py index 74f2cdb..525a4ce 100644 --- a/main/models.py +++ b/main/models.py @@ -70,14 +70,22 @@ class PackageManager(models.Manager): def get_flag_stats(self): results = [] # first the orphans - unflagged = self.filter(maintainer=0).count() - flagged = self.filter(maintainer=0).filter(needupdate=True).count() - results.append((User(id=0,first_name='Orphans'), unflagged, flagged)) + noflag = self.filter(maintainer=0).count() + flagged = self.filter(maintainer=0).filter(needupdate=True).count() + flagnotest = self.filter(maintainer=0).filter( + needupdate=True).exclude( + repo=Package.REPOS['testing']).count() + results.append( + (User(id=0,first_name='Orphans'), noflag, flagged, flagnotest)) # now the rest for maint in User.objects.all().order_by('first_name'): - unflagged = self.filter(maintainer=maint.id).count() - flagged = self.filter(maintainer=maint.id).filter(needupdate=True).count() - results.append((maint, unflagged, flagged)) + noflag = self.filter(maintainer=maint.id).count() + flagged = self.filter(maintainer=maint.id).filter( + needupdate=True).count() + flagnotest = self.filter(maintainer=maint.id).filter( + needupdate=True).exclude( + repo=Package.REPOS['testing']).count() + results.append((maint, noflag, flagged, flagnotest)) return results diff --git a/templates/devel/index.html b/templates/devel/index.html index 9105537..d993e3b 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -29,12 +29,14 @@ <th width="50%">Arch</th> <th># Packages</th> <th># Flagged</th> + <th># Flagnotest</th> </tr> {% for arch in arches %} <tr class="{% cycle pkgr2,pkgr1 %}"> <td><strong>{{ arch.name }}</strong></td> <td><a href="/packages/?arch={{ arch.name }}"><strong>{{ arch.count }}</strong> packages</a></td> <td><a href="/packages/?arch={{ arch.name }}&flagged_only=y"><strong>{{ arch.flagged }}</strong> packages</a></td> + <td><a href="/packages/?arch={{ arch.name }}&flagged_only=y"><strong>{{ arch.flagnotest }}</strong> packages</a></td> </tr> {% endfor %} </table> @@ -66,12 +68,14 @@ <th width="50%">Maintainer</th> <th># Packages</th> <th># Flagged</th> + <th># Flagnotest</th> </tr> {% for maint in stats %} <tr class="{% cycle pkgr2,pkgr1 %}"> <td><strong>{{ maint.0.get_full_name }}</strong></td> <td><a href="/packages/?maint={{ maint.0.id }}"><strong>{{ maint.1 }}</strong> packages</a></td> <td><a href="/packages/?maint={{ maint.0.id }}&flagged_only=y"><strong>{{ maint.2 }}</strong> packages</a></td> + <td><a href="/packages/?maint={{ maint.0.id }}&flagged_only=y"><strong>{{ maint.3 }}</strong> packages</a></td> </tr> {% endfor %} </table> |