Revision ca5148f2
b/snf-astakos-app/astakos/im/auth_providers.py | ||
---|---|---|
86 | 86 |
logout_from_provider_text = None |
87 | 87 |
icon_url = None |
88 | 88 |
icon_medium_url = None |
89 |
method_prompt = None |
|
89 | 90 |
|
90 | 91 |
def get_message(self, msg, **kwargs): |
91 | 92 |
params = kwargs |
... | ... | |
145 | 146 |
self.icon_medium_url = '%s%s' % (settings.MEDIA_URL, 'im/auth/icons-medium/%s.png' % |
146 | 147 |
self.module.lower()) |
147 | 148 |
|
149 |
if not self.method_prompt: |
|
150 |
self.method_prompt = _('%s login method') % self.get_title_display |
|
148 | 151 |
|
149 | 152 |
def __getattr__(self, key): |
150 | 153 |
if not key.startswith('get_'): |
... | ... | |
234 | 237 |
login_prompt_template = 'im/auth/third_party_provider_generic_login_prompt.html' |
235 | 238 |
logout_from_provider_text = ' at your Academic account (shibboleth)' |
236 | 239 |
|
240 |
method_prompt = _('Academic credentials') |
|
241 |
|
|
237 | 242 |
|
238 | 243 |
class TwitterAuthProvider(AuthProvider): |
239 | 244 |
module = 'twitter' |
b/snf-astakos-app/astakos/im/messages.py | ||
---|---|---|
200 | 200 |
AUTH_PROVIDER_NOT_ACTIVE_FOR_USER = "You cannot login using '%(provider)s'." |
201 | 201 |
AUTH_PROVIDER_NOT_ACTIVE_FOR_CREATE = "Sign up using '%(provider)s' is disabled." |
202 | 202 |
AUTH_PROVIDER_NOT_ACTIVE_FOR_ADD = "You cannot add %(provider)s login method." |
203 |
AUTH_PROVIDER_ADDED = "New login method added successfully." |
|
203 |
AUTH_PROVIDER_ADDED = "%s enabled for this account." |
|
204 |
AUTH_PROVIDER_REMOVED = "%s removed for this account." |
|
204 | 205 |
AUTH_PROVIDER_ADD_FAILED = "Failed to add new login method." |
205 | 206 |
AUTH_PROVIDER_ADD_EXISTS = "It seems that this account is already assigned to another user." |
206 | 207 |
AUTH_PROVIDER_LOGIN_TO_ADD = "The new login method will be assigned once you login to your account." |
b/snf-astakos-app/astakos/im/target/__init__.py | ||
---|---|---|
160 | 160 |
user.add_auth_provider(provider_module, identifier=identifier, |
161 | 161 |
affiliation=affiliation, |
162 | 162 |
provider_info=provider_info) |
163 |
messages.success(request, astakos_messages.AUTH_PROVIDER_ADDED) |
|
163 |
provider = auth_providers.get_provider(provider_module) |
|
164 |
message = _(astakos_messages.AUTH_PROVIDER_ADDED) % provider.get_method_prompt_display |
|
165 |
messages.success(request, message) |
|
164 | 166 |
return HttpResponseRedirect(reverse('edit_profile')) |
165 | 167 |
|
166 | 168 |
# astakos user exists ? |
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
904 | 904 |
|
905 | 905 |
if provider.can_remove(): |
906 | 906 |
provider.delete() |
907 |
message = astakos_messages.AUTH_PROVIDER_REMOVED % \ |
|
908 |
provider.settings.get_method_prompt_display |
|
909 |
messages.success(request, message) |
|
907 | 910 |
return HttpResponseRedirect(reverse('edit_profile')) |
908 | 911 |
else: |
909 | 912 |
raise PermissionDenied |
... | ... | |
1226 | 1229 |
projects = ProjectApplication.objects.search_by_name(q) |
1227 | 1230 |
projects = projects.filter(~Q(project__last_approval_date__isnull=True)) |
1228 | 1231 |
projects = projects.exclude(project__in=accepted_projects) |
1229 |
|
|
1232 |
|
|
1230 | 1233 |
table = tables.UserProjectApplicationsTable(projects, user=request.user, |
1231 | 1234 |
prefix="my_projects_") |
1232 | 1235 |
if request.method == "POST": |
1233 | 1236 |
table.caption = _('SEARCH RESULTS') |
1234 | 1237 |
else: |
1235 | 1238 |
table.caption = _('ALL PROJECTS') |
1236 |
|
|
1239 |
|
|
1237 | 1240 |
RequestConfig(request, paginate={"per_page": PAGINATE_BY}).configure(table) |
1238 | 1241 |
|
1239 | 1242 |
return object_list( |
... | ... | |
1388 | 1391 |
'im/landing.html', |
1389 | 1392 |
context_instance=get_context(request)) |
1390 | 1393 |
|
1391 |
|
|
1394 |
|
|
1392 | 1395 |
def api_access(request): |
1393 | 1396 |
return render_response( |
1394 | 1397 |
'im/api_access.html', |
1395 |
context_instance=get_context(request)) |
|
1398 |
context_instance=get_context(request)) |
Also available in: Unified diff