Commit 945d05a32efe62461a0bdfe88adc701e9ccd3ede
1 parent
949b6049
Exists in
master
and in
2 other branches
Added configurations to login_redirect
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com>
Showing
3 changed files
with
5 additions
and
0 deletions
Show diff stats
cookbooks/colab/templates/gitlab.py.erb
| @@ -20,6 +20,7 @@ urls = { | @@ -20,6 +20,7 @@ urls = { | ||
| 20 | 'include': 'colab_gitlab.urls', | 20 | 'include': 'colab_gitlab.urls', |
| 21 | 'namespace': 'gitlab', # TODO: do not allow to change namespace | 21 | 'namespace': 'gitlab', # TODO: do not allow to change namespace |
| 22 | 'prefix': '^gitlab/', | 22 | 'prefix': '^gitlab/', |
| 23 | + 'login': '/gitlab/users/sign_in', | ||
| 23 | } | 24 | } |
| 24 | 25 | ||
| 25 | menu_title = _('Development') | 26 | menu_title = _('Development') |
cookbooks/colab/templates/noosfero.py.erb
| @@ -21,6 +21,7 @@ urls = { | @@ -21,6 +21,7 @@ urls = { | ||
| 21 | 'include': 'colab_noosfero.urls', | 21 | 'include': 'colab_noosfero.urls', |
| 22 | 'namespace': 'noosfero', # TODO: do not allow to change namespace | 22 | 'namespace': 'noosfero', # TODO: do not allow to change namespace |
| 23 | 'prefix': '^social/', | 23 | 'prefix': '^social/', |
| 24 | + 'login': '/social/account/login', | ||
| 24 | } | 25 | } |
| 25 | 26 | ||
| 26 | menu_title = _('Social') | 27 | menu_title = _('Social') |
src/colab-spb-theme-plugin/colab_spb_theme/templates/registration/login.html
| @@ -28,6 +28,9 @@ | @@ -28,6 +28,9 @@ | ||
| 28 | <br> | 28 | <br> |
| 29 | <form action="{% url 'login' %}" method="post" role="form" class="form-horizontal signup"> | 29 | <form action="{% url 'login' %}" method="post" role="form" class="form-horizontal signup"> |
| 30 | {% csrf_token %} | 30 | {% csrf_token %} |
| 31 | + {% if previous_path %} | ||
| 32 | + <input type="hidden" value="{{previous_path}}" name="previous_path"> | ||
| 33 | + {% endif %} | ||
| 31 | 34 | ||
| 32 | <div class="row"> | 35 | <div class="row"> |
| 33 | <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-4 col-sm-8 col-sm-offset-2 col-xs-12"> | 36 | <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-4 col-sm-8 col-sm-offset-2 col-xs-12"> |