From 8a5d0b2d9270d6995f5148c7071fc8d76c6f51ea Mon Sep 17 00:00:00 2001 From: "xiaokong1937@gmail.com" Date: Thu, 26 Jan 2017 20:24:50 +0800 Subject: [PATCH] remove unused templatetags: users_tags and common_tags --- .../templates/assets/admin_user_detail.html | 4 +- .../assets/templates/assets/asset_detail.html | 1 - .../templates/assets/asset_group_detail.html | 4 +- apps/assets/templates/assets/asset_list.html | 3 +- .../templates/assets/asset_tag_detail.html | 4 +- .../templates/assets/asset_tags_list.html | 3 +- apps/assets/templates/assets/idc_assets.html | 4 +- apps/assets/templates/assets/idc_detail.html | 4 +- .../templates/assets/system_user_asset.html | 4 +- .../assets/system_user_asset_group.html | 4 +- .../templates/assets/system_user_detail.html | 4 +- .../templates/assets/system_user_list.html | 1 - .../templates/audits/command_log_list.html | 1 - .../templates/audits/proxy_log_detail.html | 1 - .../templates/audits/proxy_log_list.html | 1 - apps/ops/templates/cron/detail.html | 2 - apps/ops/templates/sudo/detail.html | 2 - apps/ops/templates/task/detail.html | 2 - .../perms/asset_permission_asset.html | 4 +- .../perms/asset_permission_detail.html | 4 +- .../perms/asset_permission_list.html | 1 - .../perms/asset_permission_user.html | 4 +- apps/templates/_base_list.html | 1 - apps/users/models/user.py | 18 +++++++-- .../users/user_asset_permission.html | 4 +- apps/users/templates/users/user_detail.html | 4 +- .../templates/users/user_granted_asset.html | 4 +- .../users/user_group_asset_permission.html | 4 +- .../users/user_group_granted_asset.html | 4 +- apps/users/templates/users/user_profile.html | 11 ++---- apps/users/templatetags/__init__.py | 0 apps/users/templatetags/users_tags.py | 38 ------------------- apps/users/views/user.py | 3 -- 33 files changed, 37 insertions(+), 116 deletions(-) delete mode 100644 apps/users/templatetags/__init__.py delete mode 100644 apps/users/templatetags/users_tags.py diff --git a/apps/assets/templates/assets/admin_user_detail.html b/apps/assets/templates/assets/admin_user_detail.html index 53948921b..a766e0efc 100644 --- a/apps/assets/templates/assets/admin_user_detail.html +++ b/apps/assets/templates/assets/admin_user_detail.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -396,4 +394,4 @@ $(document).ready(function () { }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index 3a1975a9a..f52c50dc0 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} {% load static %} {% load i18n %} diff --git a/apps/assets/templates/assets/asset_group_detail.html b/apps/assets/templates/assets/asset_group_detail.html index 94e41ad10..36835d9dd 100644 --- a/apps/assets/templates/assets/asset_group_detail.html +++ b/apps/assets/templates/assets/asset_group_detail.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -395,4 +393,4 @@ $(document).ready(function () { }) -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 1ee934363..66542986b 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -1,7 +1,6 @@ {% extends '_base_list.html' %} {% load i18n %} {% load static %} -{% load common_tags %} {% block custom_head_css_js %} @@ -325,4 +324,4 @@ $(document).ready(function(){ $('#asset_bulk_update_modal').modal('hide'); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/asset_tag_detail.html b/apps/assets/templates/assets/asset_tag_detail.html index ac190af17..a479034fc 100644 --- a/apps/assets/templates/assets/asset_tag_detail.html +++ b/apps/assets/templates/assets/asset_tag_detail.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -276,4 +274,4 @@ $(document).ready(function () { deleteTagAssets($this, name, the_url, data); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/asset_tags_list.html b/apps/assets/templates/assets/asset_tags_list.html index 7c3e20c7c..21df7e19b 100644 --- a/apps/assets/templates/assets/asset_tags_list.html +++ b/apps/assets/templates/assets/asset_tags_list.html @@ -1,6 +1,5 @@ {% extends '_base_list.html' %} {% load i18n static %} -{#{% load common_tags %}#} {% block custom_head_css_js %} @@ -123,4 +122,4 @@ $(document).ready(function () { -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/idc_assets.html b/apps/assets/templates/assets/idc_assets.html index b9976a966..3c21728bb 100644 --- a/apps/assets/templates/assets/idc_assets.html +++ b/apps/assets/templates/assets/idc_assets.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -365,4 +363,4 @@ $(document).ready(function () { -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/idc_detail.html b/apps/assets/templates/assets/idc_detail.html index 9073e6f1a..a6b5b1c4c 100644 --- a/apps/assets/templates/assets/idc_detail.html +++ b/apps/assets/templates/assets/idc_detail.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -156,4 +154,4 @@ $(document).ready(function () { idcDelete(name, the_url); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/system_user_asset.html b/apps/assets/templates/assets/system_user_asset.html index 522c58144..21814879e 100644 --- a/apps/assets/templates/assets/system_user_asset.html +++ b/apps/assets/templates/assets/system_user_asset.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -370,4 +368,4 @@ $(document).ready(function () { -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/system_user_asset_group.html b/apps/assets/templates/assets/system_user_asset_group.html index 52e48815c..13a21770e 100644 --- a/apps/assets/templates/assets/system_user_asset_group.html +++ b/apps/assets/templates/assets/system_user_asset_group.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -133,4 +131,4 @@ $('.select2').select2(); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/system_user_detail.html b/apps/assets/templates/assets/system_user_detail.html index 4367b1c3a..342cfbb55 100644 --- a/apps/assets/templates/assets/system_user_detail.html +++ b/apps/assets/templates/assets/system_user_detail.html @@ -1,6 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} -{% load users_tags %} {% load static %} {% load i18n %} @@ -184,4 +182,4 @@ $('.select2').select2(); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/assets/templates/assets/system_user_list.html b/apps/assets/templates/assets/system_user_list.html index ba264541c..9815c7569 100644 --- a/apps/assets/templates/assets/system_user_list.html +++ b/apps/assets/templates/assets/system_user_list.html @@ -1,6 +1,5 @@ {% extends '_base_list.html' %} {% load i18n %} -{% load common_tags %} {% block table_search %} {% endblock %} diff --git a/apps/audits/templates/audits/command_log_list.html b/apps/audits/templates/audits/command_log_list.html index 5e0cf0752..9f7ef9f34 100644 --- a/apps/audits/templates/audits/command_log_list.html +++ b/apps/audits/templates/audits/command_log_list.html @@ -1,7 +1,6 @@ {% extends '_base_list.html' %} {% load i18n %} {% load static %} -{% load common_tags %} {% block content_left_head %} diff --git a/apps/audits/templates/audits/proxy_log_detail.html b/apps/audits/templates/audits/proxy_log_detail.html index 05b06071c..e1cd487b4 100644 --- a/apps/audits/templates/audits/proxy_log_detail.html +++ b/apps/audits/templates/audits/proxy_log_detail.html @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load common_tags %} {% load static %} {% load i18n %} diff --git a/apps/audits/templates/audits/proxy_log_list.html b/apps/audits/templates/audits/proxy_log_list.html index 9c26e82ac..9ae38bae2 100644 --- a/apps/audits/templates/audits/proxy_log_list.html +++ b/apps/audits/templates/audits/proxy_log_list.html @@ -1,7 +1,6 @@ {% extends '_base_list.html' %} {% load i18n %} {% load static %} -{% load common_tags %} {% block content_left_head %}