openstack
/
horizon
Code Issues Proposed changes

Merge "Don't display expiration warning for expiration date in the past"

This commit is contained in:
Zuul 2019-09-25 22:42:04 +00:00 committed by Gerrit Code Review
parent 87b57dfe71 3ba5da30d3
commit fd08f3672f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_auth/views.py
View File

@ -10,6 +10,7 @@
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import datetime
import logging
from django.conf import settings
@ -146,8 +147,9 @@ def login(request):
request.session['region_name'] = region_name
expiration_time = request.user.time_until_expiration()
threshold_days = settings.PASSWORD_EXPIRES_WARNING_THRESHOLD_DAYS
if expiration_time is not None and \
expiration_time.days <= threshold_days:
if (expiration_time is not None and
expiration_time.days <= threshold_days and
expiration_time > datetime.timedelta(0)):
expiration_time = str(expiration_time).rsplit(':', 1)[0]
msg = (_('Please consider changing your password, it will expire'
' in %s minutes') %