Updated to check if a public link to use the organization website instead of /

[ghost]

If I am using this with a client, I don't want them to be able to click on my logo and go to my public dashboard. Not like they could login, but I feel like it should link to the organization website since they can't do anything in the backend (the point of the public link).

This is my first PR with WebODM. In addition, I am not an expert in Django, so if there's an easier or more "Django-y" way to do this, please let me know. Thank you!

[pierotofy]

Hey @ssantacroce-uwach 👋 thanks for the PR! As not everyone who uses WebODM sets, or even has, an organization website (it's blank by default), perhaps the conditional check should include for the presence of the organization website variable (if it's blank, redirect to /, else redirect to the organization website for on public urls)?

[ghost]

So I could be mistaken, but with a new system the organization_website gets set to either the WebODM or OpenDroneMaps page. It is not blank.

But if that is a concern, would a check that the organization_website not being blank suffice?

[pierotofy]

Ah, good point; it's actually set to https://github.com/OpenDroneMap/WebODM/.

I guess a good way to do this would be to move the default value to a variable, then expose that variable to the django view (or make a django function) and check to see if the value has been changed from the default. (Don't use "https://github.com/OpenDroneMap/WebODM/" in the view's if expression, that would be a duplication).

[ghost]

I just modified it to go to '/' if the org url is blank. It really shouldn't matter if the url is the default. If you're on the "public" link, it shouldn't have a url that goes back to the dashboard, because that isn't something a public viewer would be able to login to. And if it's a logged in user for whatever reason viewing the public link, they know how to get back to the dashboard...

[pierotofy]

I got it; how about checking if the user is logged in?

• Public URL and anonymous? --> org website (or "/" if blank)
• Else --> "/"

[ghost]

That is a way better idea! Sorry I'm very new to Django, my main framework is FastAPI. Your suggestion has been implemented!

[pierotofy]

Awesome, thanks!!