Intended to solve #494 #495

BassCoder2808 · 2023-07-26T05:05:31Z

Made the changes suggested by @vargenau and @goneall which will help better format the error messages and warnings we receive in the online tools.
Solves HUGE warning for deprecated licences #494

vargenau · 2023-07-26T05:50:28Z

Hi @BassCoder2808,
Did you test your changes?
In the third case, I suppose you should have:

warnings = str(warnings)

Minor update on the variable name

BassCoder2808 · 2023-07-26T09:09:16Z

Hi @vargenau yes I just saw that the 3rd case had the warnings string, now I have made that change

vargenau · 2023-07-26T09:12:09Z

Hi @vargenau yes I just saw that the 3rd case had the warnings string, now I have made that change

Thank you @BassCoder2808

goneall

Thanks @BassCoder2808 - just a minor suggested change to format the raw HTML a bit better

goneall · 2023-07-27T16:12:17Z

src/app/core.py

@@ -221,7 +221,8 @@ def ntia_check_helper(request):
                """ If any warnings are returned """
                if (request.is_ajax()):
                    ajaxdict["type"] = "warning"
-                    ajaxdict["data"] = "The following warning(s) were raised:\n" + str(retval)
+                    warnings = str(retval)
+                    ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', '<br />')


Just a nit - it would be nice to keep a linefeed in case anyone looks at the raw HTML.

We could also have

"The following warning(s) were raised: \n"

instead of:

"The following warning(s) were raised:\n"

so that the first warning is not on the same line.

goneall · 2023-07-27T16:12:43Z

src/app/core.py

@@ -221,7 +221,8 @@ def ntia_check_helper(request):
                """ If any warnings are returned """
                if (request.is_ajax()):
                    ajaxdict["type"] = "warning"
-                    ajaxdict["data"] = "The following warning(s) were raised:\n" + str(retval)
+                    warnings = str(retval)
+                    ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', '<br />')


Suggested change

ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', ' ')

ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', ' \n')

goneall · 2023-07-27T16:12:59Z

src/app/core.py

@@ -327,7 +328,8 @@ def license_validate_helper(request):
                """ If any warnings are returned """
                if (request.is_ajax()):
                    ajaxdict["type"] = "warning"
-                    ajaxdict["data"] = "The following warning(s) were raised: " + str(retval)
+                    warnings = str(retval)
+                    ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', '<br />')


Suggested change

ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', ' ')

ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', ' \n')

goneall · 2023-07-27T16:13:13Z

src/app/core.py

@@ -519,7 +521,8 @@ def license_convert_helper(request):
            else :
                if (request.is_ajax()):
                    ajaxdict["type"] = "warning"
-                    ajaxdict["data"] = "The following warning(s) were raised by "+ myfile.name + ": " + str(warnings)
+                    warnings = str(warnings)
+                    ajaxdict["data"] = "The following warning(s) were raised by "+ myfile.name + ": " + warnings.replace('\n', '<br />')


Suggested change

ajaxdict["data"] = "The following warning(s) were raised by "+ myfile.name + ": " + warnings.replace('\n', ' ')

ajaxdict["data"] = "The following warning(s) were raised by "+ myfile.name + ": " + warnings.replace('\n', ' \n')

…line-tools into Formatting

BassCoder2808 · 2023-07-27T17:26:09Z

Thanks @BassCoder2808 - just a minor suggested change to format the raw HTML a bit better

Hi @goneall I have made the changes, let me know if anything else needs to be changed

goneall

Thanks @BassCoder2808 and @vargenau

Added formatting

9029a35

BassCoder2808 mentioned this pull request Jul 26, 2023

HUGE warning for deprecated licences #494

Closed

Update core.py

d3ea20a

Minor update on the variable name

goneall requested changes Jul 27, 2023

View reviewed changes

BassCoder2808 added 2 commits July 27, 2023 22:52

Minor formatting update

7d9cf61

Merge branch 'Formatting' of https://github.com/BassCoder2808/spdx-on…

8e15c35

…line-tools into Formatting

BassCoder2808 requested review from goneall and vargenau July 27, 2023 17:25

vargenau approved these changes Jul 27, 2023

View reviewed changes

goneall approved these changes Jul 28, 2023

View reviewed changes

goneall merged commit bec5b78 into spdx:main Jul 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Intended to solve #494 #495

Intended to solve #494 #495

BassCoder2808 commented Jul 26, 2023

vargenau commented Jul 26, 2023

BassCoder2808 commented Jul 26, 2023

vargenau commented Jul 26, 2023

goneall left a comment

goneall Jul 27, 2023

vargenau Jul 27, 2023

goneall Jul 27, 2023

goneall Jul 27, 2023

goneall Jul 27, 2023

BassCoder2808 commented Jul 27, 2023

goneall left a comment

	ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', '<br />')
	ajaxdict["data"] = "The following warning(s) were raised:\n" + warnings.replace('\n', '<br />\n')

Intended to solve #494 #495

Intended to solve #494 #495

Conversation

BassCoder2808 commented Jul 26, 2023

vargenau commented Jul 26, 2023

BassCoder2808 commented Jul 26, 2023

vargenau commented Jul 26, 2023

goneall left a comment

Choose a reason for hiding this comment

goneall Jul 27, 2023

Choose a reason for hiding this comment

vargenau Jul 27, 2023

Choose a reason for hiding this comment

goneall Jul 27, 2023

Choose a reason for hiding this comment

goneall Jul 27, 2023

Choose a reason for hiding this comment

goneall Jul 27, 2023

Choose a reason for hiding this comment

BassCoder2808 commented Jul 27, 2023

goneall left a comment

Choose a reason for hiding this comment