From 7a630e934908707e575d6c99c14f8e54bff07f86 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Mon, 29 Jan 2018 12:03:45 -0600 Subject: [PATCH 01/19] Stub out individual release view --- tests/unit/packaging/test_models.py | 22 ++++++++++++++++++++++ warehouse/manage/views.py | 15 +++++++++++++++ warehouse/packaging/models.py | 19 +++++++++++++++++++ warehouse/routes.py | 7 +++++++ warehouse/templates/manage/release.html | 24 ++++++++++++++++++++++++ warehouse/templates/manage/releases.html | 9 ++++----- 6 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 warehouse/templates/manage/release.html diff --git a/tests/unit/packaging/test_models.py b/tests/unit/packaging/test_models.py index 74c2eae3b679..184f8c06764a 100644 --- a/tests/unit/packaging/test_models.py +++ b/tests/unit/packaging/test_models.py @@ -254,6 +254,28 @@ def test_urls(self, db_session, home_page, download_url, project_urls, # TODO: It'd be nice to test for the actual ordering here. assert dict(release.urls) == dict(expected) + def test_acl(self, db_session): + project = DBProjectFactory.create() + owner1 = DBRoleFactory.create(project=project) + owner2 = DBRoleFactory.create(project=project) + maintainer1 = DBRoleFactory.create( + project=project, + role_name="Maintainer", + ) + maintainer2 = DBRoleFactory.create( + project=project, + role_name="Maintainer", + ) + release = DBReleaseFactory.create(project=project) + + assert release.__acl__() == [ + (Allow, "group:admins", "admin"), + (Allow, str(owner1.user.id), ["manage", "upload"]), + (Allow, str(owner2.user.id), ["manage", "upload"]), + (Allow, str(maintainer1.user.id), ["upload"]), + (Allow, str(maintainer2.user.id), ["upload"]), + ] + class TestFile: diff --git a/warehouse/manage/views.py b/warehouse/manage/views.py index 9a6c77d834f2..4ca5df3afa1d 100644 --- a/warehouse/manage/views.py +++ b/warehouse/manage/views.py @@ -109,6 +109,21 @@ def manage_project_releases(project, request): return {"project": project} +@view_config( + route_name="manage.project.release", + renderer="manage/release.html", + uses_session=True, + permission="manage", + effective_principals=Authenticated, +) +def manage_project_release(release, request): + project = release.project + return { + "project": project, + "release": release, + } + + @view_config( route_name="manage.project.roles", renderer="manage/roles.html", diff --git a/warehouse/packaging/models.py b/warehouse/packaging/models.py index b67670c60e43..ad7bf0bfc43f 100644 --- a/warehouse/packaging/models.py +++ b/warehouse/packaging/models.py @@ -342,6 +342,25 @@ def __table_args__(cls): # noqa viewonly=True, ) + def __acl__(self): + session = orm.object_session(self) + acls = [ + (Allow, "group:admins", "admin"), + ] + + # Get all of the users for this project. + query = session.query(Role).filter(Role.project == self) + query = query.options(orm.lazyload("project")) + query = query.options(orm.joinedload("user").lazyload("emails")) + for role in sorted( + query.all(), + key=lambda x: ["Owner", "Maintainer"].index(x.role_name)): + if role.role_name == "Owner": + acls.append((Allow, str(role.user.id), ["manage", "upload"])) + else: + acls.append((Allow, str(role.user.id), ["upload"])) + return acls + @property def urls(self): _urls = OrderedDict() diff --git a/warehouse/routes.py b/warehouse/routes.py index 6366d707921a..723675ff8267 100644 --- a/warehouse/routes.py +++ b/warehouse/routes.py @@ -134,6 +134,13 @@ def includeme(config): traverse="/{project_name}", domain=warehouse, ) + config.add_route( + "manage.project.release", + "/manage/project/{project_name}/{version}/", + factory="warehouse.packaging.models:ProjectFactory", + traverse="/{project_name}/{version}", + domain=warehouse, + ) config.add_route( "manage.project.roles", "/manage/project/{project_name}/collaboration/", diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html new file mode 100644 index 000000000000..8bf8fc9ee083 --- /dev/null +++ b/warehouse/templates/manage/release.html @@ -0,0 +1,24 @@ +{# + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +-#} +{% extends "manage_project_base.html" %} + +{% set active_tab = 'releases' %} + +{% block title %}Manage '{{ project.name }}' release{% endblock %} + +{% block main %} +

Release

+ {{ release }} + {{ project }} +{% endblock %} diff --git a/warehouse/templates/manage/releases.html b/warehouse/templates/manage/releases.html index 8b76863bde7c..3ec6c05dc40a 100644 --- a/warehouse/templates/manage/releases.html +++ b/warehouse/templates/manage/releases.html @@ -31,8 +31,9 @@

Releases ({{ project.releases|length }})

{% for release in project.releases %} - {# TODO: https://github.com/pypa/warehouse/issues/2807 {{ release.version }} #} - {{ release.version }} + + {{ release.version }} + @@ -52,12 +53,10 @@

Releases ({{ project.releases|length }})

- {# TODO: https://github.com/pypa/warehouse/issues/2807 - + Edit - #} View From ee0e13c1404133668ee511c226f8727324771b8e Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Wed, 31 Jan 2018 15:46:18 -0600 Subject: [PATCH 02/19] Include lazy files in view --- warehouse/manage/views.py | 1 + warehouse/templates/manage/release.html | 1 + 2 files changed, 2 insertions(+) diff --git a/warehouse/manage/views.py b/warehouse/manage/views.py index 4ca5df3afa1d..5e4a12647d79 100644 --- a/warehouse/manage/views.py +++ b/warehouse/manage/views.py @@ -121,6 +121,7 @@ def manage_project_release(release, request): return { "project": project, "release": release, + "files": release.files.all(), } diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index 8bf8fc9ee083..27b7360f217f 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -21,4 +21,5 @@

Release

{{ release }} {{ project }} + {{ files }} {% endblock %} From fae380f0b3fda01de65d2a45aa47e1c443e5ad3c Mon Sep 17 00:00:00 2001 From: Nicole Harris Date: Fri, 2 Feb 2018 18:03:37 +0000 Subject: [PATCH 03/19] Begin styling release detail page --- .../static/sass/blocks/_breadcrumbs.scss | 19 +++ warehouse/static/sass/blocks/_dropdown.scss | 2 +- .../sass/blocks/_heading-wsubtitle.scss | 10 ++ warehouse/static/sass/blocks/_table.scss | 4 - warehouse/static/sass/warehouse.scss | 1 + warehouse/templates/manage/release.html | 150 +++++++++++++++++- 6 files changed, 177 insertions(+), 9 deletions(-) create mode 100644 warehouse/static/sass/blocks/_breadcrumbs.scss diff --git a/warehouse/static/sass/blocks/_breadcrumbs.scss b/warehouse/static/sass/blocks/_breadcrumbs.scss new file mode 100644 index 000000000000..8dbd02371783 --- /dev/null +++ b/warehouse/static/sass/blocks/_breadcrumbs.scss @@ -0,0 +1,19 @@ +.breadcrumbs { + margin: 0; + padding: 0; + @include clearfix; + + &__breadcrumb { + list-style-type: none; + display: inline-block; + float: left; + + &:not(:last-child):after { + content: "\f054"; + font-family: "FontAwesome"; + margin: 0 5px; + color: $light-grey; + font-size: 12px; + } + } +} diff --git a/warehouse/static/sass/blocks/_dropdown.scss b/warehouse/static/sass/blocks/_dropdown.scss index 303599d76228..6913ff93ff37 100644 --- a/warehouse/static/sass/blocks/_dropdown.scss +++ b/warehouse/static/sass/blocks/_dropdown.scss @@ -79,7 +79,7 @@ &:hover { background-color: $base-grey; color: $text-color; - text-decoration: underline; + text-decoration: none; } .fa { diff --git a/warehouse/static/sass/blocks/_heading-wsubtitle.scss b/warehouse/static/sass/blocks/_heading-wsubtitle.scss index 71832d9cb240..eccc660fc20b 100644 --- a/warehouse/static/sass/blocks/_heading-wsubtitle.scss +++ b/warehouse/static/sass/blocks/_heading-wsubtitle.scss @@ -19,6 +19,10 @@

Heading

Subtitle

+ + Modifiers: + - in-content: restore heading spacing for instances where heading is not + at the top of the page */ .heading-wsubtitle { @@ -30,4 +34,10 @@ font-style: italic; margin-bottom: 15px; } + + &--in-content { + .heading-wsubtitle__heading { + padding-top: 30px; + } + } } diff --git a/warehouse/static/sass/blocks/_table.scss b/warehouse/static/sass/blocks/_table.scss index 97ed9031ce5a..4657bbab9f49 100644 --- a/warehouse/static/sass/blocks/_table.scss +++ b/warehouse/static/sass/blocks/_table.scss @@ -191,10 +191,6 @@ width: 130px; } - .table__version { - font-weight: bold; - } - .table__options { width: 110px; text-align: right; diff --git a/warehouse/static/sass/warehouse.scss b/warehouse/static/sass/warehouse.scss index 625058911a67..bc3d50177a19 100644 --- a/warehouse/static/sass/warehouse.scss +++ b/warehouse/static/sass/warehouse.scss @@ -65,6 +65,7 @@ @import "blocks/applied-filters"; @import "blocks/author-profile"; @import "blocks/badge"; +@import "blocks/breadcrumbs"; @import "blocks/button"; @import "blocks/button-group"; @import "blocks/callout-block"; diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index 27b7360f217f..1ee3aa9c65cd 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -18,8 +18,150 @@ {% block title %}Manage '{{ project.name }}' release{% endblock %} {% block main %} -

Release

- {{ release }} - {{ project }} - {{ files }} +
+

Release Version {{ release.version }}

+ + +
+ + {% if files %} + + + + + + + + + + + + + {% for file in files %} + + + + + + + + + {% endfor %} + +
Filename, SizeTypePy VersionUpload DateComment
+ {{ file.filename }} + {% if file.size %}({{ file.size|filesizeformat() }}){% endif %}
+ 		{{ file.packagetype|format_package_type }}{{ file.requires_python }}{{ file.upload_time|format_date() }}{% if file.comment_text %}{{ file.comment_text }}{% else %}-{% endif %} +
+ +
+ + + Download + + + + Copy Checksum + + + + Delete + +
+
+
+ {% endif %} + +
+ {% if files %} +

Uploading New Files

+ {% else %} +

No Files Found

+ {% endif %} +

Learn how to upload files on the Python Packaging User Guide

+
+ +

Release Settings

+ +
+

Delete Release

+

+ {% if files %} + Deleting will irreversibly delete this release along with {{ files|length() }} + {% trans count=files|length %} + file. + {% pluralize %} + files. + {% endtrans %} + {% else %} + Deleting will irreversibly delete this release. + {% endif %} +

+ Delete +
+ + + + {% if files %} + {% for file in files %} + + {% endfor %} + {% endif %} {% endblock %} From d58db8f779819e319185c3bb687d5ddd5cafbf7a Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Fri, 2 Feb 2018 15:24:52 -0600 Subject: [PATCH 04/19] Fix routes --- warehouse/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warehouse/routes.py b/warehouse/routes.py index 723675ff8267..487e072481dc 100644 --- a/warehouse/routes.py +++ b/warehouse/routes.py @@ -136,7 +136,7 @@ def includeme(config): ) config.add_route( "manage.project.release", - "/manage/project/{project_name}/{version}/", + "/manage/project/{project_name}/release/{version}/", factory="warehouse.packaging.models:ProjectFactory", traverse="/{project_name}/{version}", domain=warehouse, From 6323f76293047c09930a43e2cb6fa0499067f211 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Fri, 2 Feb 2018 15:29:04 -0600 Subject: [PATCH 05/19] Fix linting errors --- warehouse/templates/manage/release.html | 132 ++++++++++++------------ 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index 1ee3aa9c65cd..901a104f1589 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -40,54 +40,54 @@

Release Version {{ release.version }}

- {% for file in files %} - - - {{ file.filename }} - {% if file.size %}({{ file.size|filesizeformat() }}){% endif %}
- - {{ file.packagetype|format_package_type }} - {{ file.requires_python }} - {{ file.upload_time|format_date() }} - {% if file.comment_text %}{{ file.comment_text }}{% else %}-{% endif %} - -
- -
- - - Download - - - - Copy Checksum - - - - Delete - -
+ {% for file in files %} + + + {{ file.filename }} + {% if file.size %}({{ file.size|filesizeformat() }}){% endif %}
+ + {{ file.packagetype|format_package_type }} + {{ file.requires_python }} + {{ file.upload_time|format_date() }} + {% if file.comment_text %}{{ file.comment_text }}{% else %}-{% endif %} + +
+ +
+ + + Download + + + + Copy Checksum + + + + Delete +
- - - {% endfor %} +
+ + + {% endfor %} {% endif %}
{% if files %} -

Uploading New Files

- {% else %} -

No Files Found

- {% endif %} -

Learn how to upload files on the Python Packaging User Guide

+

Uploading New Files

+ {% else %} +

No Files Found

+ {% endif %} +

Learn how to upload files on the Python Packaging User Guide

Release Settings

@@ -136,32 +136,32 @@

Delete Release {{ release.version }}?

{% if files %} - {% for file in files %} -
Cancel From dd99868cf224572eb413306f09542b57c72c5c79 Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Mon, 5 Feb 2018 18:46:24 -0600 Subject: [PATCH 09/19] Individual file deletion --- tests/unit/manage/test_views.py | 145 ++++++++++++++++++++++++ warehouse/manage/views.py | 67 ++++++++++- warehouse/templates/manage/release.html | 10 +- 3 files changed, 217 insertions(+), 5 deletions(-) diff --git a/tests/unit/manage/test_views.py b/tests/unit/manage/test_views.py index baa054f66b18..bcf8a93628e7 100644 --- a/tests/unit/manage/test_views.py +++ b/tests/unit/manage/test_views.py @@ -351,6 +351,151 @@ def test_delete_project_release_bad_confirm(self): ) ] + def test_delete_project_release_file(self, monkeypatch): + release_file = pretend.stub( + filename='foo-bar.tar.gz', + id=str(uuid.uuid4()), + ) + release = pretend.stub( + version='1.2.3', + project=pretend.stub(name='foobar'), + ) + request = pretend.stub( + POST={ + 'confirm_filename': release_file.filename, + 'file_id': release_file.id, + }, + method="POST", + db=pretend.stub( + delete=pretend.call_recorder(lambda a: None), + add=pretend.call_recorder(lambda a: None), + query=lambda a: pretend.stub( + filter=lambda *a: pretend.stub(one=lambda: release_file), + ), + ), + route_path=pretend.call_recorder(lambda *a, **kw: '/the-redirect'), + session=pretend.stub( + flash=pretend.call_recorder(lambda *a, **kw: None) + ), + user=pretend.stub(), + remote_addr=pretend.stub(), + ) + journal_obj = pretend.stub() + journal_cls = pretend.call_recorder(lambda **kw: journal_obj) + monkeypatch.setattr(views, 'JournalEntry', journal_cls) + + view = views.ManageProjectRelease(release, request) + + result = view.delete_project_release_file() + + assert isinstance(result, HTTPSeeOther) + assert result.headers["Location"] == "/the-redirect" + + assert request.session.flash.calls == [ + pretend.call( + f"Successfully deleted file {release_file.filename!r}.", + queue="success", + ) + ] + assert request.db.delete.calls == [pretend.call(release_file)] + assert request.db.add.calls == [pretend.call(journal_obj)] + assert journal_cls.calls == [ + pretend.call( + name=release.project.name, + action=f"remove file {release_file.filename}", + version=release.version, + submitted_by=request.user, + submitted_from=request.remote_addr, + ), + ] + assert request.route_path.calls == [ + pretend.call( + 'manage.project.release', + project_name=release.project.name, + version=release.version, + ) + ] + + def test_delete_project_release_file_no_confirm(self): + release = pretend.stub( + version='1.2.3', + project=pretend.stub(name='foobar'), + ) + request = pretend.stub( + POST={'confirm_filename': ''}, + method="POST", + db=pretend.stub(delete=pretend.call_recorder(lambda a: None)), + route_path=pretend.call_recorder(lambda *a, **kw: '/the-redirect'), + session=pretend.stub( + flash=pretend.call_recorder(lambda *a, **kw: None) + ), + ) + view = views.ManageProjectRelease(release, request) + + result = view.delete_project_release_file() + + assert isinstance(result, HTTPSeeOther) + assert result.headers["Location"] == "/the-redirect" + + assert request.db.delete.calls == [] + assert request.session.flash.calls == [ + pretend.call( + "Must confirm the request.", queue='error' + ) + ] + assert request.route_path.calls == [ + pretend.call( + 'manage.project.release', + project_name=release.project.name, + version=release.version, + ) + ] + + def test_delete_project_release_file_bad_confirm(self): + release_file = pretend.stub( + filename='foo-bar.tar.gz', + id=str(uuid.uuid4()), + ) + release = pretend.stub( + version='1.2.3', + project=pretend.stub(name='foobar'), + ) + request = pretend.stub( + POST={'confirm_filename': 'invalid'}, + method="POST", + db=pretend.stub( + delete=pretend.call_recorder(lambda a: None), + query=lambda a: pretend.stub( + filter=lambda *a: pretend.stub(one=lambda: release_file), + ), + ), + route_path=pretend.call_recorder(lambda *a, **kw: '/the-redirect'), + session=pretend.stub( + flash=pretend.call_recorder(lambda *a, **kw: None) + ), + ) + view = views.ManageProjectRelease(release, request) + + result = view.delete_project_release_file() + + assert isinstance(result, HTTPSeeOther) + assert result.headers["Location"] == "/the-redirect" + + assert request.db.delete.calls == [] + assert request.session.flash.calls == [ + pretend.call( + f"'invalid' is not the same as {release_file.filename!r}", + queue="error", + ) + ] + assert request.route_path.calls == [ + pretend.call( + 'manage.project.release', + project_name=release.project.name, + version=release.version, + ) + ] + class TestManageProjectRoles: diff --git a/warehouse/manage/views.py b/warehouse/manage/views.py index 42efb5af0723..e48b6a3319c4 100644 --- a/warehouse/manage/views.py +++ b/warehouse/manage/views.py @@ -23,7 +23,7 @@ from warehouse.manage.forms import ( CreateRoleForm, ChangeRoleForm, SaveProfileForm ) -from warehouse.packaging.models import JournalEntry, Role +from warehouse.packaging.models import JournalEntry, Role, File from warehouse.utils.project import confirm_project, remove_project @@ -186,6 +186,71 @@ def delete_project_release(self): ) ) + @view_config( + request_method="POST", + request_param=["confirm_filename", "file_id"] + ) + def delete_project_release_file(self): + filename = self.request.POST.get('confirm_filename') + if not filename: + self.request.session.flash( + "Must confirm the request.", queue='error' + ) + return HTTPSeeOther( + self.request.route_path( + 'manage.project.release', + project_name=self.release.project.name, + version=self.release.version, + ) + ) + + release_file = ( + self.request.db.query(File) + .filter( + File.name == self.release.project.name, + File.id == self.request.POST.get('file_id'), + ) + .one() + ) + + if filename != release_file.filename: + self.request.session.flash( + f"{filename!r} is not the same as {release_file.filename!r}", + queue="error", + ) + return HTTPSeeOther( + self.request.route_path( + 'manage.project.release', + project_name=self.release.project.name, + version=self.release.version, + ) + ) + + self.request.db.add( + JournalEntry( + name=self.release.project.name, + action=f"remove file {release_file.filename}", + version=self.release.version, + submitted_by=self.request.user, + submitted_from=self.request.remote_addr, + ), + ) + + self.request.db.delete(release_file) + + self.request.session.flash( + f"Successfully deleted file {release_file.filename!r}.", + queue="success", + ) + + return HTTPSeeOther( + self.request.route_path( + 'manage.project.release', + project_name=self.release.project.name, + version=self.release.version, + ) + ) + @view_config( route_name="manage.project.roles", diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index 259a0171bf40..94124c901c90 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -139,7 +139,10 @@

Delete Release {{ release.version }}?

Cancel From cf8c393b34cb36afc9f75ae047166773f62c6a34 Mon Sep 17 00:00:00 2001 From: Nicole Harris Date: Tue, 6 Feb 2018 19:29:45 +0000 Subject: [PATCH 10/19] Make files table responsive --- warehouse/static/sass/blocks/_table.scss | 86 +++++++++++++++++++++++- warehouse/templates/manage/release.html | 37 +++++----- 2 files changed, 106 insertions(+), 17 deletions(-) diff --git a/warehouse/static/sass/blocks/_table.scss b/warehouse/static/sass/blocks/_table.scss index 4657bbab9f49..8440dfb9dfe8 100644 --- a/warehouse/static/sass/blocks/_table.scss +++ b/warehouse/static/sass/blocks/_table.scss @@ -250,6 +250,86 @@ } } + &--files { + .table__name, + .table__type, + .table__version, + .table__upload { + padding-right: 20px; + } + + .table__type { + width: 90px; + } + + .table__version { + width: 110px; + } + + .table__upload { + width: 130px; + } + + .table__options { + width: 100px; + } + + @media only screen and (max-width: $large-desktop) { + .table__version { + display: none; + } + } + + @media only screen and (max-width: $desktop) { + .table__type { + display: none; + } + } + + @media only screen and (max-width: $small-tablet) { + thead { + display: none; + } + + tbody tr, + tbody tr:nth-child(2n) { + display: block; + padding: 20px 0; + border-bottom: 1px solid $base-grey; + } + + .table__name, + .table__upload, + .table__options { + display: block; + width: 100%; + text-align: left; + border-bottom: 0; + padding: 4px 0; + } + + .table__name a { + font-weight: bold; + } + + .table__options { + .dropdown { + display: block; + float: none; + + .button { + display: block; + width: 100%; + } + + .dropdown__content { + width: 100%; + } + } + } + } + } + &--collaborators { .table__user { padding-right: 20px; @@ -293,7 +373,7 @@ tbody tr, tbody tr:nth-child(2n) { display: block; - padding: 20px 10px; + padding: 20px 0; border-bottom: 1px solid $base-grey; } @@ -309,6 +389,10 @@ padding: 4px 0; } + .table__user a { + font-weight: bold; + } + input[type="text"], select, .table__action, diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index 94124c901c90..59da729c661d 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -28,29 +28,35 @@

Release Version {{ release.version }}

{% if files %} - +
- - - - - + + + + {% for file in files %} - - - - - - + + + {% for file in files %} - - + - + - +
Filename, SizeTypePy VersionUpload DateCommentFilename, SizeTypePy VersionUpload Date
- {{ file.filename }} + + + {{ file.filename }} + {% if file.size %}({{ file.size|filesizeformat() }}){% endif %}
{{ file.packagetype|format_package_type }}{{ file.requires_python }}{{ file.upload_time|format_date() }}{% if file.comment_text %}{{ file.comment_text }}{% else %}-{% endif %} + {{ file.packagetype|format_package_type }}{{ file.requires_python }}{{ file.upload_time|format_date() }}

Release Settings

@@ -106,7 +112,7 @@

Delete Release

Deleting will irreversibly delete this release. {% endif %}

- Delete + Delete
- {{ file.filename }} + + + {{ file.filename }} + +
{% if file.size %} ({{ file.size|filesizeformat() }}){% endif %} - + Copy SHA256 Checksum SHA256 From 66793cb873240669dfe78b7c2545c9e1614eaab4 Mon Sep 17 00:00:00 2001 From: Nicole Harris Date: Fri, 9 Feb 2018 07:47:16 +0000 Subject: [PATCH 14/19] Link to public release page --- warehouse/templates/manage/release.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index 3437a31be272..9d350ee9e25a 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -23,7 +23,7 @@

Release Version {{ release.version }}

  • All {{ project.name}} Releases
    • -
  • Release Version {{ release.version }}
    • +
  • Release Version {{ release.version }} - View Release
    • From 25e863b13ca1545231855b1affcc6ea81472294a Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Fri, 9 Feb 2018 09:43:20 -0600 Subject: [PATCH 15/19] Fix linting errors --- warehouse/templates/manage/release.html | 157 ++++++++++++------------ 1 file changed, 78 insertions(+), 79 deletions(-) diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index 9d350ee9e25a..903efa9ae7b1 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -141,87 +141,86 @@

    Delete Release {{ release.version }}?

    {% if files %} - {% for file in files %} -
    SHA256{{ file.sha256_digest }}{{ file.sha256_digest }} Copy @@ -197,7 +197,7 @@

    Checksums for {{ file.filename }}

    MD5{{ file.md5_digest }}{{ file.md5_digest }} Copy @@ -206,7 +206,7 @@

    Checksums for {{ file.filename }}

    BLAKE2-256{{ file.blake2_256_digest }}{{ file.blake2_256_digest }} Copy From b3d3b16340320d61a458c33441fdd15bb4b09f0f Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Fri, 9 Feb 2018 09:56:33 -0600 Subject: [PATCH 18/19] Delete some dead code --- warehouse/static/js/warehouse/index.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/warehouse/static/js/warehouse/index.js b/warehouse/static/js/warehouse/index.js index 0166acf7f4a4..c175f13952ea 100644 --- a/warehouse/static/js/warehouse/index.js +++ b/warehouse/static/js/warehouse/index.js @@ -165,14 +165,3 @@ docReady(() => { } } }); - -// Copy handler for checksum modal on release management page - -//docReady(() => { -// let setCopiedText = (e) => { -// e.trigger.innerHTML = "Copied"; -// e.clearSelection(); -// }; -// -// new Clipboard(".-js-copy-checksum").on("success", setCopiedText); -//}); From 15c018ad6031b6fbcd403b98bacd087ef45f904a Mon Sep 17 00:00:00 2001 From: Dustin Ingram Date: Fri, 9 Feb 2018 10:10:27 -0600 Subject: [PATCH 19/19] Use 'hash' instead of 'checksum' --- warehouse/static/js/warehouse/index.js | 6 +++--- warehouse/static/sass/blocks/_table.scss | 10 +++++----- warehouse/templates/manage/release.html | 24 +++++++++++------------ warehouse/templates/packaging/detail.html | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/warehouse/static/js/warehouse/index.js b/warehouse/static/js/warehouse/index.js index c175f13952ea..919d8d973d94 100644 --- a/warehouse/static/js/warehouse/index.js +++ b/warehouse/static/js/warehouse/index.js @@ -67,8 +67,8 @@ docReady(Statuspage); // Copy handler for // - the pip command on package detail page -// - the copy checksum on package detail page -// - the copy checksum on release maintainers page +// - the copy hash on package detail page +// - the copy hash on release maintainers page docReady(() => { let setCopiedTooltip = (e) => { e.trigger.setAttribute("aria-label", "Copied!"); @@ -76,7 +76,7 @@ docReady(() => { }; new Clipboard(".-js-copy-pip-command").on("success", setCopiedTooltip); - new Clipboard(".-js-copy-checksum").on("success", setCopiedTooltip); + new Clipboard(".-js-copy-hash").on("success", setCopiedTooltip); // Get all elements with class "tooltipped" and bind to focousout and // mouseout events. Change the "aria-label" to "original-label" attribute diff --git a/warehouse/static/sass/blocks/_table.scss b/warehouse/static/sass/blocks/_table.scss index f8c5cea61f44..754c01791e6c 100644 --- a/warehouse/static/sass/blocks/_table.scss +++ b/warehouse/static/sass/blocks/_table.scss @@ -330,11 +330,11 @@ } } - &--checksums { + &--hashes { margin-top: $spacing-unit / 2; .table__algorithm, - .table__checksum { + .table__hash { padding-right: 20px; } @@ -342,7 +342,7 @@ font-weight: 600; } - td.table__checksum { + td.table__hash { word-break: break-all; } @@ -370,8 +370,8 @@ } .table__algorithm, - .table__checksum, - .table__copy { + .table__copy, + .table__hash { display: block; text-align: left; border-bottom: 0; diff --git a/warehouse/templates/manage/release.html b/warehouse/templates/manage/release.html index f3e3224d1b96..b7f5f738dd7a 100644 --- a/warehouse/templates/manage/release.html +++ b/warehouse/templates/manage/release.html @@ -70,9 +70,9 @@

    Release Version {{ release.version }}

    Download     - + - View Checksums + View Hashes @@ -169,46 +169,46 @@

    Delete {{ file.filename }}?

    -
    +