Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework the text suggested in PR 1343 #1452

Merged
merged 4 commits into from
Jul 17, 2018
Merged

Rework the text suggested in PR 1343 #1452

merged 4 commits into from
Jul 17, 2018

Conversation

wblock
Copy link
Contributor

@wblock wblock commented Jun 28, 2018

No description provided.

@ghost ghost assigned wblock Jun 28, 2018
@ghost ghost added the review label Jun 28, 2018
@wblock wblock mentioned this pull request Jun 28, 2018
Closed
@seanm
Copy link

seanm commented Jun 28, 2018

LGTM

william-gr
william-gr requested changes Jul 2, 2018
View reviewed changes
Copy link
Member

@william-gr william-gr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This is not a correct string line breaking in python, you will get all the extra spaces. It should be:

help_text=(
    'foo '
    'bar '
    'alpha '
),

@wblock
Copy link
Contributor Author

wblock commented Jul 10, 2018

That was the way we were doing it, but the UI team said that would break translations. (I wrote this same comment yesterday, but it was gone today.)

@william-gr
Copy link
Member

UI team uses javascript, we use python. I suppose its a bit different.

william-gr
william-gr requested changes Jul 17, 2018
View reviewed changes
Copy link
Member

@william-gr william-gr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

That is also not valid python,
do:

help_text=(
    'foo '
    'bar '
),

william-gr
william-gr approved these changes Jul 17, 2018
View reviewed changes
Copy link
Member

@william-gr william-gr left a comment

Choose a reason for hiding this comment

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

Thanks!

@william-gr william-gr merged commit 79d598e into master Jul 17, 2018
@ghost ghost removed the review label Jul 17, 2018
@william-gr william-gr deleted the wb-ntlmv1 branch July 17, 2018 20:02
wblock added a commit to truenas/webui that referenced this pull request Jul 18, 2018
@wblock
Fix lack of clarity in NTLMv1
b0a0fc5 
truenas/middleware#1343
https://redmine.ixsystems.com/issues/36103
truenas/middleware#1452
@wblock wblock mentioned this pull request Jul 18, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@william-gr william-gr william-gr approved these changes

Assignees

@wblock wblock

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wblock @seanm @william-gr