From 376ce4a69e016d13eff28589a5caa627bf7c451b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 7 Feb 2011 12:48:12 -0600 Subject: Clean up Package related objects code Main change is just to move groups from the default packagegroup_set location to a related_name of groups. Also refer to the Package class directly rather than by text string if we have it available. Signed-off-by: Dan McGee --- templates/packages/details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/packages/details.html') diff --git a/templates/packages/details.html b/templates/packages/details.html index fcbaf083..de6b637f 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -112,7 +112,7 @@ {{ pkg.license }} Groups: - {% with pkg.packagegroup_set.all as groups %} + {% with pkg.groups.all as groups %} {% if groups %} {% for g in groups %} Date: Mon, 7 Feb 2011 13:45:05 -0600 Subject: Move license to a related model This allows us to store multiple licenses per package in a more elegant fashion, and will later allow us to search and filter on this information. Signed-off-by: Dan McGee --- templates/packages/details.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/packages/details.html') diff --git a/templates/packages/details.html b/templates/packages/details.html index de6b637f..14b657e3 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -108,8 +108,8 @@ {% if pkg.url %}{{ pkg.url }}{% endif %} - License: - {{ pkg.license }} + License(s): + {{ pkg.licenses.all|join:", " }} Groups: {% with pkg.groups.all as groups %} -- cgit v1.2.3 From 7f1c7b08227e49172734f09552ceae8bc1f685ad Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Feb 2011 19:31:56 -0600 Subject: Read in optional deps and show in web interface Signed-off-by: Dan McGee --- templates/packages/details.html | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'templates/packages/details.html') diff --git a/templates/packages/details.html b/templates/packages/details.html index 14b657e3..ac997184 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -159,16 +159,18 @@ {% if deps %}
    - {% for depend in deps %} - {% ifequal depend.pkg None %} -
  • {{ depend.dep.depname }} (virtual)
    • - {% else %} + {% for depend in deps %} + {% ifequal depend.pkg None %} +
  • {{ depend.dep.depname }} (virtual)
    • + {% else %}
  • {{ depend.dep.depname }} - {{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %} - (testing){% endif %}
    • - {% endifequal %} - {% endfor %} + title="View package details for {{ depend.dep.depname }}">{{ depend.dep.depname }}{{ depend.dep.depvcmp|default:"" }} + {% if depend.pkg.repo.testing %}(testing){% endif %} + {% if depend.dep.optional %}(optional){% endif %} + {% if depend.dep.description %}{{ depend.dep.description }}{% endif %} + + {% endifequal %} + {% endfor %}
{% endif %} @@ -184,9 +186,10 @@ {% if rqdby %}
    {% for req in rqdby %} -
  • {{ req.pkgname }} - {% if req.repo.testing %} (testing){% endif %}
    • + {% if req.repo.testing %}(testing){% endif %} + {% endfor %}
{% endif %} -- cgit v1.2.3 From 8d3d05c7cb81611537aa34fa68e98e5e22b74847 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Feb 2011 20:00:33 -0600 Subject: Allow for optional info in required by display We need to make our root object the PackageDepend rather than the Package to get at this, so do a slight refactor on get_requiredby(). Signed-off-by: Dan McGee --- templates/packages/details.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'templates/packages/details.html') diff --git a/templates/packages/details.html b/templates/packages/details.html index ac997184..09b970cd 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -186,9 +186,10 @@ {% if rqdby %}
    {% for req in rqdby %} -
  • {{ req.pkgname }} - {% if req.repo.testing %}(testing){% endif %} +
  • {{ req.pkg.pkgname }} + {% if req.pkg.repo.testing %}(testing){% endif %} + {% if req.optional %}(optional){% endif %}
    • {% endfor %}
-- cgit v1.2.3 From dfc4d919f1b0349d5143764c3f8f62c240e50623 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 22 Feb 2011 17:24:09 -0600 Subject: Use hyphen to offset optdep description Signed-off-by: Dan McGee --- templates/packages/details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/packages/details.html') diff --git a/templates/packages/details.html b/templates/packages/details.html index 09b970cd..ea5e528c 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -167,7 +167,7 @@ title="View package details for {{ depend.dep.depname }}">{{ depend.dep.depname }}{{ depend.dep.depvcmp|default:"" }} {% if depend.pkg.repo.testing %}(testing){% endif %} {% if depend.dep.optional %}(optional){% endif %} - {% if depend.dep.description %}{{ depend.dep.description }}{% endif %} + {% if depend.dep.description %}- {{ depend.dep.description }}{% endif %} {% endifequal %} {% endfor %} -- cgit v1.2.3 From 8b77efbfabfb3d65b0400e123025c02346454214 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 3 Mar 2011 14:59:04 -0600 Subject: Template fine-grained permissioning Rather than use user.is_authenticated, rely on certain permissions being set for the user. This allows us to open up the developer side and not assume everyone is a package maintainer. Allow all logged-in users to still view todo lists, but don't show the complete/incomplete links (only the text) unless they are allowed to mess with todo lists. Signed-off-by: Dan McGee --- templates/packages/details.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/packages/details.html') diff --git a/templates/packages/details.html b/templates/packages/details.html index ea5e528c..f73e9d7c 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -26,7 +26,7 @@ title="Testing package details for {{ tp.pkgname }}">{{ tp.pkgver }}-{{ tp.pkgrel }} in testing {% endif %}{% endwith %} - {% if user.is_authenticated %} + {% if perms.main.change_package %}
  • Click here to unflag
  • Click here to unflag all split packages
    • {% endif %} @@ -40,7 +40,7 @@
  • Download From Mirror
    • - {% if user.is_authenticated %} + {% if perms.main.change_package %}
    {% csrf_token %}

    {% if user in pkg.maintainers %} -- cgit v1.2.3