Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1010 from watchdogpolska/hotfix-branch
Hotfix branch
- Loading branch information
Showing
5 changed files
with
17 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
from django.contrib import admin | ||
from mptt.admin import MPTTModelAdmin | ||
|
||
from teryt_tree.models import JednostkaAdministracyjna | ||
|
||
|
||
class JednostkaAdministracyjnaAdmin(MPTTModelAdmin): | ||
list_display = ["id", "name", "slug", "category", "parent", "updated_on", "active"] | ||
list_display_links = ["id", "name"] | ||
list_filter = ["category", "updated_on", "active"] | ||
search_fields = ["id", "name", "slug"] | ||
|
||
|
||
admin.site.unregister(JednostkaAdministracyjna) # unregister original | ||
admin.site.register(JednostkaAdministracyjna, JednostkaAdministracyjnaAdmin) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,9 @@ | ||
{% load socialaccount account i18n %} | ||
{% get_social_accounts user as accounts %} | ||
|
||
{% if not accounts.facebook %} | ||
<a class="btn btn-default" href="{% provider_login_url "facebook" method="oauth2" process="connect" %}"> | ||
<i class="fa fa-facebook" aria-hidden="true"></i> | ||
{% trans 'Connect a Facebook account' %} | ||
</a> | ||
{% endif %} | ||
|
||
{% if not accounts.twitter %} | ||
<a class="btn btn-default" href="{% provider_login_url "twitter" process="connect" %}"> | ||
<i class="fa fa-twitter" aria-hidden="true"></i> | ||
{% trans 'Connect a Twitter account' %} | ||
</a> | ||
{% endif %} | ||
|
||
{% if not accounts.gitlab %} | ||
<a class="btn btn-default" href="{% provider_login_url "gitlab" process="connect"%}"> | ||
<i class="fa fa-gitlab" aria-hidden="true"></i> | ||
{% trans 'Connect a GitLab account' %} | ||
</a> | ||
{% endif %} | ||
|
||
{% if not accounts.google %} | ||
<a class="btn btn-default" href="{% provider_login_url "google" process="connect"%}"> | ||
<a class="btn btn-default" href="{% provider_login_url "google" process="connect"%}"> | ||
<i class="fa fa-google" aria-hidden="true"></i> | ||
{% trans 'Connect a Google account' %} | ||
</a> | ||
{% endif %} | ||
|
||
{% if not accounts.github %} | ||
<a class="btn btn-default" href="{% provider_login_url "github" process="connect" %}"> | ||
<i class="fa fa-github" aria-hidden="true"></i> | ||
{% trans 'Connect a GitHub account' %} | ||
</a> | ||
{% endif %} |