Skip to content

S3 Compat SigV4 addon reauth リンクを削除 #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tishin-endou wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

S3 Compat SigV4 addon reauth リンクを削除 #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin/rdm_addons/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def get_institusion_settings_template(config):
short_name = config.short_name
base_path = os.path.join('rdm_addons', 'addons')

if short_name in ['dataverse', 'owncloud', 's3', 'iqbrims',
if short_name in ['dataverse', 'owncloud', 's3', 's3compatsigv4', 'iqbrims',
'dropboxbusiness', 'weko']:
return os.path.join(base_path, '{}_institution_settings.html'.format(short_name))
return os.path.join(base_path, 'institution_settings_default.html')
Expand Down
11 changes: 11 additions & 0 deletions admin/templates/rdm_addons/addons/s3compatsigv4_institution_settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{% load i18n %}
<!-- Authorization -->
<div class="addon-settings addon-generic scripted"
data-addon-short-name="{{ addon.addon_short_name }}"
data-addon-name="{{ addon.addon_full_name }}"
data-institution-id="{{ institution.id }}">
<h4 class="addon-title">
<img class="addon-icon" src="{{ addon.addon_icon_url }}">
<span>{{ addon.addon_full_name }}</span>
</h4>
</div>
11 changes: 11 additions & 0 deletions admin_tests/rdm_addons/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
import logging
logging.getLogger('website.project.model').setLevel(logging.DEBUG)


class AddonConfig(object):
def __init__(self, short_name):
self.short_name = short_name


class TestRdmAddonOption(AdminTestCase):
def setUp(self):
super(TestRdmAddonOption, self).setUp()
Expand Down Expand Up @@ -37,3 +43,8 @@ def test_get_is_allowed_default(self):

option = utils.get_rdm_addon_option(self.institution.id, 'dropboxbusiness', create=False)
nt.assert_false(option.is_allowed)

def test_get_s3compatsigv4_institution_settings_template(self):
template = utils.get_institusion_settings_template(AddonConfig('s3compatsigv4'))

nt.assert_equal(template, 'rdm_addons/addons/s3compatsigv4_institution_settings.html')
Loading