Skip to content

#3404 adds some enhancements to the repository submission file upload#3479

Merged
joemull merged 4 commits into
masterfrom
3404-update
May 18, 2023
Merged

#3404 adds some enhancements to the repository submission file upload#3479
joemull merged 4 commits into
masterfrom
3404-update

Conversation

@ajrbyers

@ajrbyers ajrbyers commented Apr 4, 2023

Copy link
Copy Markdown
Member

Closes #3404

@ajrbyers ajrbyers requested review from joemull and mauromsl May 5, 2023 08:52

@joemull joemull left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wanted to run this to see what it looked like and got a migration dependency error.

class Migration(migrations.Migration):

dependencies = [
('core', '0078_auto_20230222_1317'),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing a dependency migration:

django.db.migrations.exceptions.NodeNotFoundError: Migration repository.0033_file_upload_texts dependencies reference nonexistent parent node ('core', '0078_auto_20230222_1317')

@ajrbyers ajrbyers May 18, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing a dependency migration:

django.db.migrations.exceptions.NodeNotFoundError: Migration repository.0033_file_upload_texts dependencies reference nonexistent parent node ('core', '0078_auto_20230222_1317')

The dependencies for this migration are super weird. It shouldn't require this core migration or the press one. I've removed this. Here's a screenshot of what it looks like:

image

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is now saying this needs merging with others on 1.5: CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0033_file_upload_texts, 0035_alter_preprintaccess_options in repository).

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Egads. Should be okay now.

@joemull joemull left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just one question about some text that is still hard-coded

<p>{{ request.repository.name }} {% trans 'requires that all author uploads be PDF files.' %}</p>
<p>{{ request.repository.name }} {{ request.repository.require_pdf_help }}</p>
{% else %}
<p>{% trans 'You can upload a file in any format though PDF is recommended.' %}</p>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new flexibility for other parts of this page is great. I wish this line were removed though, since it could potentially conflict with the custom text when someone doesn't require PDFs but wants to give other instructions. Also I don't think users need to be told any file type is allowed, since the upload will be a smooth process in that case. What if we remove the line altogether?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new flexibility for other parts of this page is great. I wish this line were removed though, since it could potentially conflict with the custom text when someone doesn't require PDFs but wants to give other instructions. Also I don't think users need to be told any file type is allowed, since the upload will be a smooth process in that case. What if we remove the line altogether?

Agreed. Commit incoming.

@ajrbyers ajrbyers requested a review from joemull May 18, 2023 11:28
@joemull joemull merged commit a480f37 into master May 18, 2023
@joemull joemull deleted the 3404-update branch May 18, 2023 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

No open projects
Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Preprints: Step 3 (upload/attach supp files) should support custom text

3 participants