Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add website, github, and location info to User Model #113

Merged
merged 4 commits into from Sep 13, 2015

Conversation

killpanda
Copy link
Contributor

对应的 Trello 链接 https://trello.com/c/AEVdVhFX

添加了一个非常临时的 template 主要是用于测试

@halfcrazy
Copy link
Member

可以补上前端对应的设置页面提在一个pr里

@killpanda
Copy link
Contributor Author

好的

@killpanda killpanda changed the title add website, github, and location info to User Model WIP: add website, github, and location info to User Model Sep 7, 2015
@killpanda killpanda changed the title WIP: add website, github, and location info to User Model [WIP] add website, github, and location info to User Model Sep 7, 2015
killpanda referenced this pull request in killpanda/firefly Sep 9, 2015
@killpanda killpanda changed the title [WIP] add website, github, and location info to User Model add website, github, and location info to User Model Sep 11, 2015
@killpanda
Copy link
Contributor Author

@halfcrazy 这个 PR 已经完成

@halfcrazy
Copy link
Member

@killpanda 咦,为什么在我这里看CI挂了。

@killpanda
Copy link
Contributor Author

@halfcrazy 是呀,不过看着报错信息还挺奇怪的。比方说

assert current_user.is_authenticated()
TypeError: 'bool' object is not callable

@halfcrazy
Copy link
Member

@killpanda 这个的意思是current_user.is_authenticated就是bool值了把,不用再加上括号求值,我这里Travis-ci打不开,你试试把上面那里的括号去了重push一下

@killpanda
Copy link
Contributor Author

@halfcrazy 这个地方我没有动过,并且在尝试 user.is_authenticated,类型是 bound method

很好奇之前 CI 也是通过的吗?

@halfcrazy
Copy link
Member

@killpanda 之前肯定是通的啦。你可以看一下最近合并的那次pr,后面是绿色的箭头。我看了一下你提交的代码,会不会跟你第二个commit里面import进去的current_user有关,这个是你新引入的。

@killpanda
Copy link
Contributor Author

所以这个 PR 是不是需要等 #114 合并之后再合?

@killpanda
Copy link
Contributor Author

CI 过了... @halfcrazy

@mozillazg
Copy link
Member

@killpanda 👍

1 similar comment
@halfcrazy
Copy link
Member

@killpanda 👍

halfcrazy added a commit that referenced this pull request Sep 13, 2015
add website, github, and location info to User Model
@halfcrazy halfcrazy merged commit fb8082c into python-cn:master Sep 13, 2015
@killpanda killpanda deleted the add-fields branch September 13, 2015 05:08
@killpanda
Copy link
Contributor Author

thx @halfcrazy @mozillazg

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants