From ac2278423a3d449fdfe8c813f1f2d391ef9aff08 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 3 Nov 2011 14:59:00 -0500 Subject: Many signoff page improvements Add a new 'SignoffSpecification' model which will capture metadata regarding a specific package if it differs from the norm- e.g. more or less than 2 required signoffs, is known to be bad, a comment from the maintainer, etc. The groundwork is laid here; much of this will still need to be wired up in the future. Enhance the view with a lot more JS prettiness and add revoking of signoffs. The signoff page can be filtered and the links and all the fun stuff are totally dynamic now. Signed-off-by: Dan McGee --- templates/packages/signoff_cell.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 templates/packages/signoff_cell.html (limited to 'templates/packages/signoff_cell.html') diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html new file mode 100644 index 00000000..fce5d551 --- /dev/null +++ b/templates/packages/signoff_cell.html @@ -0,0 +1,12 @@ + +{% if group.user_signed_off %} +
Revoke Signoff
+{% else %} +
Signoff
+{% endif %} -- cgit v1.2.3-2-g168b From 74d2a5df5ca7ee4b6497a6e7609491d72cdbb309 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 3 Nov 2011 17:18:13 -0500 Subject: Refactor more package signoff stuff This sets up some shared utility code for use in a later package signoff email report command. Signed-off-by: Dan McGee --- templates/packages/signoff_cell.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/packages/signoff_cell.html') diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html index fce5d551..87216193 100644 --- a/templates/packages/signoff_cell.html +++ b/templates/packages/signoff_cell.html @@ -5,8 +5,8 @@ {% if group.user_signed_off %}
Revoke Signoff
+ title="Revoke signoff {{ group.pkgbase }} for {{ group.arch }}">Revoke Signoff {% else %}
Signoff
+ title="Signoff {{ group.pkgbase }} for {{ group.arch }}">Signoff {% endif %} -- cgit v1.2.3-2-g168b From 8187b87143081a2be75032db91287f9deb9d1f89 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 3 Nov 2011 19:10:07 -0500 Subject: Add signoff options form and data entry page This allows the criteria and other information about certain signoffs to be overridden as necessary. Signed-off-by: Dan McGee --- templates/packages/signoff_cell.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'templates/packages/signoff_cell.html') diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html index 87216193..0a630119 100644 --- a/templates/packages/signoff_cell.html +++ b/templates/packages/signoff_cell.html @@ -1,12 +1,23 @@ +{% spaceless %} +{% if group.signoffs %}
    {% for signoff in group.signoffs %}
  • {{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}
  • {% endfor %}
+{% endif %} {% if group.user_signed_off %} - {% else %} - {% endif %} +{% if group.packager == user %} + +{% endif %} +{% endspaceless %} -- cgit v1.2.3-2-g168b From 5f2c3bf98baabf919681525e600639643aa2c119 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 3 Nov 2011 20:39:59 -0500 Subject: Signoffs changes and improvements * Better signoff report with more detail * Show signoff specification in signoffs view * Honor disabled/bad flags and display in approval column * Various other small bugfixes and tweaks Signed-off-by: Dan McGee --- templates/packages/signoff_cell.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'templates/packages/signoff_cell.html') diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html index 0a630119..6c705b4e 100644 --- a/templates/packages/signoff_cell.html +++ b/templates/packages/signoff_cell.html @@ -11,10 +11,12 @@ Revoke Signoff {% else %} +{% if not group.specification.known_bad and group.specification.enabled %} {% endif %} +{% endif %} {% if group.packager == user %}
Packager Options -- cgit v1.2.3-2-g168b From 5e295a3dbb0b64f229e9419384721b154e013b9e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 3 Nov 2011 21:20:50 -0500 Subject: Allow signoff options to apply to all packages across architectures If you check the new box, you can set the options for both the i686 and the x86_64 packages at the same time. Signed-off-by: Dan McGee --- templates/packages/signoff_cell.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/packages/signoff_cell.html') diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html index 6c705b4e..4f9f726b 100644 --- a/templates/packages/signoff_cell.html +++ b/templates/packages/signoff_cell.html @@ -19,7 +19,7 @@ {% endif %} {% if group.packager == user %} {% endif %} {% endspaceless %} -- cgit v1.2.3-2-g168b From 0aa42e2c01df2bf1c9e425994420f5ae10252597 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 3 Nov 2011 21:32:30 -0500 Subject: Allow signoff manipulation if you are a maintainer This is a more expensive and not-yet-optimized way of doing this, but we can fix that later as needed. Signed-off-by: Dan McGee --- templates/packages/signoff_cell.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/packages/signoff_cell.html') diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html index 4f9f726b..0bf44ca2 100644 --- a/templates/packages/signoff_cell.html +++ b/templates/packages/signoff_cell.html @@ -17,7 +17,7 @@ title="Signoff {{ group.pkgbase }} for {{ group.arch }}">Signoff
{% endif %} {% endif %} -{% if group.packager == user %} +{% if user == group.packager or user in group.maintainers %} -- cgit v1.2.3-2-g168b From 21d5f818a60ab2626f941f8ff53e263e802494d5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 11 Nov 2011 10:42:51 -0600 Subject: Touch up signoff page styles Signed-off-by: Dan McGee --- templates/packages/signoff_cell.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/packages/signoff_cell.html') diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html index 0bf44ca2..01a5d58d 100644 --- a/templates/packages/signoff_cell.html +++ b/templates/packages/signoff_cell.html @@ -1,6 +1,6 @@ {% spaceless %} {% if group.signoffs %} -
    +
      {% for signoff in group.signoffs %}
    • {{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}
    • {% endfor %} -- cgit v1.2.3-2-g168b