Merge pull request #535 from pyfarm/fix_flask_login

Lock Flask-Login to >=0.3.0,<0.4.0
pyfarm · Sep 22, 2015 · a4068ca · a4068ca
2 parents 713a15b + cce9e8a
commit a4068ca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/pyfarm/master/login.py b/pyfarm/master/login.py
@@ -122,7 +122,7 @@ def login_page():
 
 def logout_page():
     """log out the user then redirect them"""
-    logged_in = current_user.is_authenticated()
+    logged_in = current_user.is_authenticated
     if logged_in:
         logout_user()
 

diff --git a/pyfarm/master/templates/pyfarm/user_interface/layout.html b/pyfarm/master/templates/pyfarm/user_interface/layout.html
@@ -43,13 +43,6 @@
               <li class="{% block software_nb_class %}{% endblock %}"><a href="{{ url_for('software_index_ui')}}">Software</a></li>
               <li class="{% block statistics_nb_class %}{% endblock %}"><a href="{{ url_for('statistics_index_ui')}}">Statistics</a></li>
             </ul>
-            <ul class="nav navbar-nav navbar-right">
-              {% if current_user.is_anonymous() %}
-              <li><a href="/login">Login</a></li>
-              {% else %}
-              <li><a href="/logout">Logout</a></li>
-              {% endif %}
-            </ul>
           </div>
         </div>
       </nav>

diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
     "pyfarm.core>=0.9.3",
     "sqlalchemy>=0.9.9,!=1.0.0,!=1.0.1,!=1.0.2",
     "flask",
-    "flask-login",
+    "flask-login>=0.3.0,<0.4.0",
     "flask-sqlalchemy>=0.12",
     "itsdangerous",
     "blinker",