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.

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

Replace CR LF with a html BR tag for the software version comments #3040

Merged
merged 2 commits into from
Oct 27, 2017

Conversation

vrdriver
Copy link
Contributor

@vrdriver vrdriver commented Oct 24, 2017

Replace CR LN with a html br tag for the version comments.

Q A
Bug fix? no
New feature? yes
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #3039

Please update this template with something that matches your PR

Now the notes will look good on the screen if it has a new line in it.
@@ -329,8 +329,8 @@ static function showForSoftware(Software $soft) {
echo "<td class='right'>".Dropdown::getDropdownName('glpi_operatingsystems',
$data['operatingsystems_id']);
echo "</td>";
echo "<td class='numeric'>$nb</td>";
echo "<td>".$data['comment']."</td></tr>\n";
echo "<td class='numeric'>$nb</td>";
Copy link
Contributor

Choose a reason for hiding this comment

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

warning, you added some trailing spaces after the end of this line (tests fail because that)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Apologies. First time I've done this on github.

Extra spaces removed.
Copy link
Contributor Author

@vrdriver vrdriver left a comment

Choose a reason for hiding this comment

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

Extra Spaces removed.

@@ -329,8 +329,8 @@ static function showForSoftware(Software $soft) {
echo "<td class='right'>".Dropdown::getDropdownName('glpi_operatingsystems',
$data['operatingsystems_id']);
echo "</td>";
echo "<td class='numeric'>$nb</td>";
echo "<td>".$data['comment']."</td></tr>\n";
echo "<td class='numeric'>$nb</td>";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Apologies. First time I've done this on github.

@orthagh
Copy link
Contributor

orthagh commented Oct 27, 2017

last thing, @vrdriver, could you post here (and on the original issue) a screeshot of the change ?

@vrdriver
Copy link
Contributor Author

Please note the new formatting of the notes for both of these images. Before and After.
screenshot 2017-10-27 23 13 13
screenshot 2017-10-27 23 13 27

@vrdriver vrdriver changed the title Update softwareversion.class.php Replace CR LN with a html BR tag for the software version comments Oct 27, 2017
@orthagh
Copy link
Contributor

orthagh commented Oct 27, 2017

Perfect. LGTM for merging

@vrdriver
Copy link
Contributor Author

vrdriver commented Oct 27, 2017

Great. Well there's a first for me. A pull request and commit on github to an open source project. cheers. Keep up the good work with GLPI. 👍 I'll let you do the rest.

'

@vrdriver vrdriver closed this Oct 27, 2017
@tomolimo tomolimo changed the title Replace CR LN with a html BR tag for the software version comments Replace CR LF with a html BR tag for the software version comments Oct 27, 2017
@trasher trasher reopened this Oct 27, 2017
@trasher
Copy link
Contributor

trasher commented Oct 27, 2017

Please do not close until it's merged ;)

Same for refering tickets :)

@trasher trasher merged commit a338481 into glpi-project:9.2/bugfixes Oct 27, 2017
trasher pushed a commit that referenced this pull request Oct 27, 2017
…3040)

Now the notes will look good on the screen if it has a new line in it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants