From 7911fd4ef7a0aece6f0b1963e6513d741382cd0d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 12:41:26 -0600 Subject: Exclude Latin Name from developer profile form Signed-off-by: Dan McGee --- devel/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/views.py b/devel/views.py index 08b19cd7..59e2b6cb 100644 --- a/devel/views.py +++ b/devel/views.py @@ -123,7 +123,7 @@ class UserProfileForm(forms.ModelForm): class Meta: model = UserProfile - exclude = ['allowed_repos', 'user'] + exclude = ('allowed_repos', 'user', 'latin_name') @login_required @never_cache -- cgit v1.1-4-g5e80 From ff371bd37628ab6f66cf4add79bb67c276e49035 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 12:50:55 -0600 Subject: Convert packager link to search by packager Signed-off-by: Dan McGee --- packages/templatetags/package_extras.py | 15 ++++++++++++++- templates/packages/details.html | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index 67c7fbbc..3eb7578d 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -61,7 +61,7 @@ def multi_pkg_details(pkgs): return ', '.join([pkg_details_link(pkg) for pkg in pkgs]) @register.simple_tag -def userpkgs(user): +def maintainer_link(user): if user: # TODO don't hardcode title = escape('View packages maintained by ' + user.get_full_name()) @@ -73,6 +73,19 @@ def userpkgs(user): return '' @register.simple_tag +def packager_link(user): + if user: + # TODO don't hardcode + title = escape('View packages packaged by ' + user.get_full_name()) + return '%s' % ( + user.username, + title, + user.get_full_name(), + ) + return '' + + +@register.simple_tag def scm_link(package, operation): parts = (package.repo.svn_root, operation, package.pkgbase) linkbase = ( diff --git a/templates/packages/details.html b/templates/packages/details.html index a9908012..ef6ee982 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -137,7 +137,7 @@ {% with pkg.maintainers as maints %} {% if maints %} {% for m in maints %} - {% userpkgs m %}
+ {% maintainer_link m %}
{% endfor %} {% else %}Orphan{% endif %} @@ -150,7 +150,7 @@ {{ pkg.installed_size|filesizeformat }} Last Packager: - {% with pkg.packager as pkgr %}{% if pkgr %}{% userpkgs pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %} + {% with pkg.packager as pkgr %}{% if pkgr %}{% packager_link pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %} Signed: {{ pkg.is_signed|yesno|capfirst }} -- cgit v1.1-4-g5e80 From b2de5fec2bd112eb937dcb98b25685078cccdeb1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:08:47 -0600 Subject: Switch to HTML5 doctype for base template This moves us from XHTML strict to the more useful HTML5 doctype. One old holdover table attribute (cellspacing) is also fixed. Signed-off-by: Dan McGee --- templates/base.html | 5 ++--- templates/public/developer_list.html | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/base.html b/templates/base.html index 3b509070..a120c537 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,5 @@ - - + + {% block title %}Arch Linux{% endblock %} diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index 5aa4c6b2..83c62952 100644 --- a/templates/public/developer_list.html +++ b/templates/public/developer_list.html @@ -18,7 +18,7 @@ - +
-- cgit v1.1-4-g5e80 From 546012c8e0d9e757e4670dd14e41acb83eb4e997 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:27:12 -0600 Subject: Show files and directory count in standalone package files view Signed-off-by: Dan McGee --- packages/views/__init__.py | 4 ++++ templates/packages/files.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/views/__init__.py b/packages/views/__init__.py index e3264161..b420ce60 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -169,9 +169,13 @@ def files(request, name, repo, arch): pkg = get_object_or_404(Package, pkgname=name, repo__name__iexact=repo, arch__name=arch) fileslist = PackageFile.objects.filter(pkg=pkg).order_by('directory', 'filename') + dir_count = sum(1 for f in fileslist if f.is_directory) + files_count = len(fileslist) - dir_count context = { 'pkg': pkg, 'files': fileslist, + 'files_count': files_count, + 'dir_count': dir_count, } template = 'packages/files.html' if request.is_ajax(): diff --git a/templates/packages/files.html b/templates/packages/files.html index 50ab6e83..a564f726 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -8,9 +8,9 @@

Package File List: {{ pkg.pkgname }} {{ pkg.full_version }}

Back to Package

+

Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.

{% include "packages/files-list.html" %}
{% endblock %} - -- cgit v1.1-4-g5e80 From ae00d10ff48a604e9cc9dd327046661e52ff2749 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:29:06 -0600 Subject: Rename files list template for consistency We use underscores in all other templates. Also remove some of the generated whitespace in the template which is noticeable in very large package lists. Signed-off-by: Dan McGee --- packages/views/__init__.py | 2 +- templates/packages/files-list.html | 17 ----------------- templates/packages/files.html | 2 +- templates/packages/files_list.html | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 templates/packages/files-list.html create mode 100644 templates/packages/files_list.html diff --git a/packages/views/__init__.py b/packages/views/__init__.py index b420ce60..13ad0c71 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -179,7 +179,7 @@ def files(request, name, repo, arch): } template = 'packages/files.html' if request.is_ajax(): - template = 'packages/files-list.html' + template = 'packages/files_list.html' return direct_to_template(request, template, context) def details_json(request, name, repo, arch): diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html deleted file mode 100644 index 95a85d24..00000000 --- a/templates/packages/files-list.html +++ /dev/null @@ -1,17 +0,0 @@ -{% if pkg.last_update > pkg.files_last_update %} -

Note: This file list was generated from a previous version -of the package; it may be out of date.

-{% endif %} -{% if pkg.files_last_update %} -{% if files|length %} -
    - {% for file in files %} -
  • {{ file.directory }}{{ file.filename|default:'' }}
    • - {% endfor %} -
-{% else %} -

Package has no files.

-{% endif %} -{% else %} -

No file list available.

-{% endif %} diff --git a/templates/packages/files.html b/templates/packages/files.html index a564f726..6524fe93 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -9,7 +9,7 @@

Back to Package

Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.

- {% include "packages/files-list.html" %} + {% include "packages/files_list.html" %}
diff --git a/templates/packages/files_list.html b/templates/packages/files_list.html new file mode 100644 index 00000000..156d8588 --- /dev/null +++ b/templates/packages/files_list.html @@ -0,0 +1,16 @@ +{% if pkg.last_update > pkg.files_last_update %} +

Note: This file list was generated from a previous version +of the package; it may be out of date.

+{% endif %} +{% if pkg.files_last_update %} +{% if files|length %} +
    +{% for file in files %} +
  • {{ file.directory }}{{ file.filename|default:'' }}
    • {% endfor %} +
+{% else %} +

Package has no files.

+{% endif %} +{% else %} +

No file list available.

+{% endif %} -- cgit v1.1-4-g5e80 From ecbec2f85296ac6c690186ea2e1de611df4d6f72 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:41:49 -0600 Subject: reporead: fix --force flag Signed-off-by: Dan McGee --- devel/management/commands/reporead.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index c444538b..ec008ba3 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -371,9 +371,8 @@ def db_update(archname, reponame, pkgs, force=False): timestamp = None # for a force, we don't want to update the timestamp. # for a non-force, we don't want to do anything at all. - if pkg_same_version(pkg, dbpkg): - if not force: - continue + if not force and pkg_same_version(pkg, dbpkg): + continue else: timestamp = datetime.utcnow() @@ -383,7 +382,7 @@ def db_update(archname, reponame, pkgs, force=False): with transaction.commit_on_success(): # TODO Django 1.4 select_for_update() will work once released dbpkg = select_pkg_for_update(dbpkg) - if pkg_same_version(pkg, dbpkg): + if not force and pkg_same_version(pkg, dbpkg): logger.debug("Package %s was already updated", pkg.name) continue logger.info("Updating package %s", pkg.name) @@ -410,7 +409,7 @@ def filesonly_update(archname, reponame, pkgs, force=False): with transaction.commit_on_success(): if not dbpkg.files_last_update or not dbpkg.last_update: pass - elif dbpkg.files_last_update > dbpkg.last_update: + elif not force and dbpkg.files_last_update > dbpkg.last_update: logger.debug("Files for %s are up to date", pkg.name) continue # TODO Django 1.4 select_for_update() will work once released -- cgit v1.1-4-g5e80 From 3c10a82d488145f87c8825921baa6f3908ee41a7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:44:27 -0600 Subject: reporead: don't update timestamp on --force Signed-off-by: Dan McGee --- devel/management/commands/reporead.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index ec008ba3..cc536b15 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -373,7 +373,7 @@ def db_update(archname, reponame, pkgs, force=False): # for a non-force, we don't want to do anything at all. if not force and pkg_same_version(pkg, dbpkg): continue - else: + elif not force: timestamp = datetime.utcnow() # The odd select_for_update song and dance here are to ensure -- cgit v1.1-4-g5e80 From 20e9a83e05e352ec6e6f8fbe70457951cf9cd047 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 5 Dec 2011 16:48:49 -0600 Subject: Update groups fixture Fix up permissions surrounding signoff objects. Signed-off-by: Dan McGee --- main/fixtures/groups.json | 50 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json index 8a6b2287..dc5a3add 100644 --- a/main/fixtures/groups.json +++ b/main/fixtures/groups.json @@ -11,11 +11,6 @@ "package" ], [ - "add_signoff", - "main", - "signoff" - ], - [ "add_todolist", "main", "todolist" @@ -49,6 +44,26 @@ "change_news", "news", "news" + ], + [ + "add_signoff", + "packages", + "signoff" + ], + [ + "change_signoff", + "packages", + "signoff" + ], + [ + "add_signoffspecification", + "packages", + "signoffspecification" + ], + [ + "change_signoffspecification", + "packages", + "signoffspecification" ] ] } @@ -342,11 +357,6 @@ "package" ], [ - "add_signoff", - "main", - "signoff" - ], - [ "add_todolist", "main", "todolist" @@ -370,6 +380,26 @@ "delete_todolistpkg", "main", "todolistpkg" + ], + [ + "add_signoff", + "packages", + "signoff" + ], + [ + "change_signoff", + "packages", + "signoff" + ], + [ + "add_signoffspecification", + "packages", + "signoffspecification" + ], + [ + "change_signoffspecification", + "packages", + "signoffspecification" ] ] } -- cgit v1.1-4-g5e80
Name: {{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}