GitLab

Servdata consumer templates: server list handling fixes

proxyto servers are auth+acct, or auth and acct should be configured
separately

to preserve server order

Ordered ManyToMany in InstRealm.proxyto would come in handy

AllServicePoints: fix MultipleObjectsReturned error

Fix branding

Introduce optional API key for Google Maps

The get_all_services() breaks with unhandled exception MultipleObjectsReturned
when there are multiple names (for either Institution or Service Location) with
the selected language.

And, this is permitted in the model, and we have users who create such DB state.

Fix this by using filter(lang=...) instead of get(lang=...)

And wrap the handling this for both org_name and loc_name in a single generic
function - taking a
django.contrib.contenttypes.fields.GenericRelatedObjectManager reference,
language, default_language and default_value.

This also removes the exception handling clutter from get_all_services().

... so that it is not in the middle of branding settings.

* properly encode & in HTML as &
* remove an accidental double double quote: ""
* change </br> to <br>

To support older installations that do not have a key in local_settings.py

Add Google API key value to javascript scripts. Remove sensor option, as it is not needed anymore. For additional info, see https://developers.google.com/maps/documentation/javascript/get-api-key#key

- Merge relevant keys in a BRANDING (sub)dict
- Don't rename the context processor more appropriately *yet*
- Allow styling similar to MANAGE_LOGIN_METHODS (local_image, image_url
  or fa_style, but keep the older option icon for backwards compatibility)

* wording, consistency, branding
* fix leftover artifacts from reStructuredText -> Markdown conversion

(wording, consistency, branding etc.)

"server re-use across institutions" use case): avoid hard-coding
Operator-Name (and F-Ticks VISINST) by tracking "usecount" for radius
clients

The get_all_services() view is missing the 'name' key from the exported JSON entries.

This got (presumably accidentally) introduced in 7f1f9f3b.

The 'name' now gets exported only if the 'inst' export threw an exception.

Fix the export for 'inst' and 'name' keys to consistently try the current
language, then 'en', then set the value to 'unknown'

institution type permits

Minor fixes from #7
- missing tag in servers_edit template
- missing PyYAML dep in requirements.txt
- Mako as an optional requirement

South migrations: improve #4 PostgreSQL workaround

(amend edumanage/migrations/0022_auto__chg_field_institutiondetails_number_id__del_field_instrealmmon_i.py)

As per discussion in #10:

* Make PyYAML import floating in 3.x (without pinning to 3.0.10)
* Move Mako import to new file requirements-optional.txt
* Update docs/installation/requirements.md to refer to requirements-optional.txt

A missing </div> was at times causing the footer to go out of place and cover
the form contents.

The original fix to the PostgreSQL issue with south migration 0022 did correctly change the field type, but did not add the Foreign Key constraint.

Improve the workaround 9a2924d5 by also adding the foreign key constraint.

For databases created with the original workaround, the foreign key constraint can be added manually with:

    ALTER TABLE edumanage_instrealmmon ADD CONSTRAINT "edumanage_i_realm_id_24cc89d4be4145e5_fk_edumanage_instrealm_id" FOREIGN KEY (realm_id) REFERENCES edumanage_instrealm(id) DEFERRABLE INITIALLY DEFERRED;

Note that not having the constraint in does not directly break anything, but
could lead to corrupt databases and the database structure is reported
differently with:

    ./manage.py inspectdb

Two minor security fixes: construct secure URLs (for uwsgi, with examples) and
mark cookies as secure