Merge pull request #113 from killpanda/add-fields

add website, github, and location info to User Model

Author: halfcrazy

firefly/forms/user.py

@@ -1,8 +1,9 @@
 # coding=utf-8
 from __future__ import absolute_import
 from flask_wtf import Form
+from flask_login import current_user
 from wtforms import StringField, PasswordField
-from wtforms.validators import ValidationError, Email, Required
+from wtforms.validators import ValidationError, Email, Required, URL
 
 from firefly.models.user import User
 
@@ -39,3 +40,17 @@ def validate_password(self, field):
             self.user = user
         else:
             raise ValidationError('邮箱或密码错误')
+
+
+class ProfileForm(Form):
+    location = StringField('Location')
+    website = StringField('URL', [URL()])
+    github_id = StringField('Github')
+
+    def save(self):
+        user = current_user
+        if user and not user.is_anonymous():
+            user.location = self.location.data
+            user.website = self.website.data
+            user.github_id = self.github_id.data
+            user.save()

firefly/models/user.py

@@ -55,9 +55,16 @@ class User(db.Document, UserMixin):
     roles = fields.ListField(
         fields.ReferenceField(Role, reverse_delete_rule=DENY), default=[])
 
+    location = db.StringField(max_length=25)
+    website = db.URLField()
+    github_id = db.StringField(max_length=25)
+
     def __str__(self):
         return self.cn
 
+    def __repr__(self):
+        return '<User id={id} cn={cn}>'.format(cn=self.cn, id=str(self.id))
+
     def url(self):
         return url_for('user.detail', id=str(self.id))
 

firefly/templates/user/settings.html

@@ -0,0 +1,38 @@
+{% extends "base.html" %}
+
+{% block title %}
+  用户设置
+{% endblock %}
+
+{% block outlet %}
+<div>
+    <form id="settingsform" class="settings-form" role="form" method="post" action="{{url_for('user.settings')}}">
+       <div class="form-group">
+          <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+          <label class="control-label" for="inputLocation">地点</label>
+          <input id="inputLocation" class="form-control" type="text" value="{{ user.location if user.location else ''}}" required="" tabindex="1" name="location"/>
+       </div>
+       <div class="form-group">
+          <label class="control-label" for="inputWebsite">网站</label>
+          <input id="inputWebsite" class="form-control" type="text" value="{{ user.website if user.website else ''}}" required="" tabindex="1" name="website"/>
+        </div>
+        <div class="form-group">
+          <label class="control-label" for="inputGithub">Github</label>
+          @<input id="inputGithub" class="form-control" type="text" value="{{ user.github_id if user.github_id else ''}}" required="" tabindex="1" name="github_id"/>
+        </div>
+        <div class="form-group">
+          <button id="loginBtn" class="login-btn btn-default" tabindex="3" type="submit">
+               修改
+          </button>
+        </div>
+    </form>
+</div>
+{% endblock %}
+
+{% block head_script %}
+<link href="{{url_for('static', filename='stylesheets/base16-light.css')}}" rel="stylesheet"/>
+<link href="{{url_for('static', filename='stylesheets/codemirror.css')}}" rel="stylesheet"/>
+<link href="{{url_for('static', filename='stylesheets/select2.min.css')}}" rel="stylesheet"/>
+<link href="{{url_for('static', filename='stylesheets/effeckt/list-items.css')}}" rel="stylesheet"/>
+<link href="{{url_for('static', filename='stylesheets/index.css')}}" rel="stylesheet" media="all"/>
+{% endblock %}

firefly/views/user.py

@@ -1,8 +1,13 @@
 # coding=utf-8
 from __future__ import absolute_import
 
+from flask import url_for, redirect
+
 from flask.views import MethodView
 from flask.blueprints import Blueprint
+from flask.ext.login import login_required, current_user
+from firefly.libs.template import render_template
+from firefly.forms.user import ProfileForm
 
 
 bp = Blueprint('user', __name__, url_prefix='/user')
@@ -12,4 +17,17 @@ class UserView(MethodView):
     def get(self, id):
         return ''
 
+
+class UserSettingsView(MethodView):
+    decorators = [login_required]
+
+    def get(self):
+        return render_template('user/settings.html', user=current_user)
+
+    def post(self):
+        form = ProfileForm()
+        form.save()
+        return redirect(url_for('user.settings'))
+
 bp.add_url_rule('/<id>/', view_func=UserView.as_view('detail'))
+bp.add_url_rule('/settings', view_func=UserSettingsView.as_view('settings'))

tests/test_user.py

@@ -35,6 +35,31 @@ def login(self, user_no):
         assert current_user.is_authenticated()
         assert url_for('security.logout') in rv.data
 
+    def test_user_settings(self):
+        LOCATION = 'Beijing'
+        WEBSITE = 'http://firefly.dev'
+        GITHUB_ID = 'firefly'
+
+        self.login(0)
+        url = url_for('user.settings')
+        assert self.users[0].location is None
+        assert self.users[0].website is None
+        assert self.users[0].github_id is None
+
+        form = {
+            'location': LOCATION,
+            'website': WEBSITE,
+            'github_id': GITHUB_ID
+        }
+        rv = self.client.post(url, data=form)
+        assert rv.status_code == 302
+
+        user = User.objects.filter(id=self.users[0].id).first()
+        assert user
+        assert user.location == LOCATION
+        assert user.website == WEBSITE
+        assert user.github_id == GITHUB_ID
+
     def test_follow_user_api(self):
         # test follow
         self.login(0)