Commit e5bc1ed8 authored by Élie Bouttier's avatar Élie Bouttier
Browse files

Merge branch 'master' of ssh://code.ffdn.org:55555/tetaneutral.net/djadhere

parents b206ba74 1ed4161a

services/admin.py

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ class IPResourceAdmin(admin.ModelAdmin): 
            fields += ['last_use']

        if obj and obj.last_time_up and obj.last_check:

            fields += ['last_time_up', 'last_check']

        if obj.category == IPRessource.CATEGORY_PUBLIC:

        if obj.category == IPResource.CATEGORY_PUBLIC:

            fields += ['password']

        if obj and obj.checkmk_label:

            fields += ['checkmk']