From 0504fbeb92e83e92e1f1bc6e003bdb3f93c4318f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 31 Mar 2011 01:48:19 -0500 Subject: Collapse all split and similar packages in recent updates list I was getting sick of seeing the *-i18n packages completely blow away anything else useful out of the recent updates sidebar. Revamp the logic here again to do something about it. As we did before, grab packages from the database and attempt to group them, but this time do it by only repo and pkgbase. From there, if we have packages in the group with a pkgname matching pkgbase, we will link just those. If not, we will create some stub objects that link to our relatively new virtual package overview screen. Signed-off-by: Dan McGee --- templates/public/index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'templates/public') diff --git a/templates/public/index.html b/templates/public/index.html index 1f4b2ce5..132412f6 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -80,15 +80,13 @@ {% for update in pkg_updates %} - {% with update|first as fpkg %} - - + - {% endwith %} {% endfor %}
{{ fpkg.pkgname }} {{ fpkg.full_version }} - {% for pkg in update %}{{ update.pkgbase }} {{ update.version }} + {% for pkg in update.package_links %}{{ pkg.arch }}{% if not forloop.last %}/{% endif %}{% endfor %}
-- cgit v1.2.3-2-g168b From c292dcfc6bf96ebf5f34342beb1367aa5361f7c4 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 28 Apr 2011 13:19:42 -0500 Subject: isotests: various changes and updates * isotests/fixtures/clockchoices.json: changed 'default' to 'unchanged' * isotests/fixtures/filesystems.json: removed 'check the installed system' line from one of the options * isotests/fixtures/modules.json: added 'ext2','ext3','ext4','swap','xfs','jfs','reiserFS' * isotests/models.py: * Added RollbackOption abstract class that adds the functions get_rollback_success_test and get_rollback_failed_test on top of the IsoOption abstract class for use with the Filesystem and Module classes since Test uses these both in 2 ways (regular and rollback). This keeps them seperated. * renamed the related names of these properties from rollback_test to rollback_test_set (seems more in-tune with the other relations) * isotests/views.py: * changed the order of the fields, the automatic order makes no sense. * Added help texts to the fields success, filesystem, rollback_filesystem and rollback_modules. * Removed help text from modules (made no sense) * Added a website field, should remain empty, a simplistic way to hopefully reduce spambot entries. * templates/isotests/results.html: * Removed the rollback yes/no section * The rollback labels should check get_rollback_success_test and get_rollback_failed_test. * Rollback checkbox removed. * Clearly tell users that success must only be selected if everything works right. * Clearly tell users to only fill in the rollback options if they did a rollback. * Added a thanks page that tells people thanks. * Added links between the pages. * Added links to lists with tests of either a specific iso or of any iso where a specific option was selected. Signed-off-by: Dan McGee Conflicts: templates/isotests/results.html --- templates/public/index.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'templates/public') diff --git a/templates/public/index.html b/templates/public/index.html index 132412f6..aa651217 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -119,6 +119,8 @@ title="Arch communities in your native language">International Communities
  • Related Projects
  • +
  • Releng-testbuild-feedback
  • Support

    -- cgit v1.2.3-2-g168b From 1ea5be1a0693d8f24b5d147092fd4a15c7fdd4a7 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 28 Apr 2011 13:11:44 -0500 Subject: isotests: Cleaned up the page titles and syncisos command Signed-off-by: Dan McGee --- templates/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/public') diff --git a/templates/public/index.html b/templates/public/index.html index aa651217..773d4782 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -120,7 +120,7 @@
  • Related Projects
  • Releng-testbuild-feedback
  • + title="Releng Testbuild Feedback">Releng Testbuild Feedback

    Support

    -- cgit v1.2.3-2-g168b From 11962fab9da3839564fb132109267b8cd6feb6ac Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 28 Apr 2011 17:52:16 -0500 Subject: Remove more hardcoded isotests links Signed-off-by: Dan McGee --- templates/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/public') diff --git a/templates/public/index.html b/templates/public/index.html index 773d4782..5b79a1fe 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -119,7 +119,7 @@ title="Arch communities in your native language">International Communities
  • Related Projects
  • -
  • Releng Testbuild Feedback
  • -- cgit v1.2.3-2-g168b From 87983d141b6b2134b22e7973b598ad7a73de17ce Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 29 Apr 2011 09:38:32 -0500 Subject: releng: final touches before public showing * Move URL prefix to /releng/feedback/ * Move link on main page to Development, not Community Signed-off-by: Dan McGee --- templates/public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/public') diff --git a/templates/public/index.html b/templates/public/index.html index 5b79a1fe..add921d1 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -119,8 +119,6 @@ title="Arch communities in your native language">International Communities
  • Related Projects
  • -
  • Releng Testbuild Feedback
  • Support

    @@ -163,6 +161,8 @@ title="Developer Wiki articles">DeveloperWiki
  • Todo Lists
  • +
  • Releng Testbuild Feedback
  • About

    -- cgit v1.2.3-2-g168b