search

CodeCatz / TrackCat

A tool for tracking the progress of the kittens (and cat{s,z}) in our CodeCatz meetup group
MIT License
5 stars 14 forks source link

Change user profile model #173

Closed mojcas closed 9 years ago

mojcas commented 9 years ago

Model UserProfile changed to introduce more meaningful ACTIVITY_LEVEL_CHOICES values, and to avoid duplication of fields inherited from Django User model

goranche commented 9 years ago

given the amount of changes to the model, shouldn't there also be a migrations file? :thought_balloon:

goranche commented 9 years ago

also, why are you changing the permissions on manage.py? please leave that file as it is, some of us actually "depend" on those permissions (not life or death depend, but sane or go insane depend)

mojcas commented 9 years ago

Those permissions, I tried to get rid of those for a while but have given up for now (it's happening for some reason with (manage.py, static/css/jquery.datetimepicker.css, static/js/jquery.datetimepicker.js) I am not sure how, as I am using Windows, and I can't make Git ignore these. Can you help? Migrations file added to the next PR .. Trying to go systematically to break this into some smaller PRs, and separate branches.

goranche commented 9 years ago

leave the permissions be, I'll fix it when (if? :smiling_imp: ) we merge this PR

you should always check what will be included in a commit (git status) and remove the changes you do not want to happen... things like this can be avoided :wink:

mojcas commented 9 years ago

Okay, I was going back and forth a lot, to sync origin master with upstream, this has sneaked in somehow at some point. Thanks to fix it!

goranche commented 9 years ago

@mojcas you might also try the following... I'd try it out, but don't have a Windows machine available

git update-index --chmod=+x manage.py
mojcas commented 9 years ago

Nice, thanks, it worked.

goranche commented 9 years ago

when trying out this PR, I get the following errors (tried migrate, makemigrations and runserver)

<class 'api.admin.UserProfileAdmin'>: (admin.E108) The value of 'list_display[1]' refers to 'fullname', which is not a callable, an attribute of 'UserProfileAdmin', or an attribute or method on 'api.UserProfile'.
<class 'api.admin.UserProfileAdmin'>: (admin.E108) The value of 'list_display[2]' refers to 'githubuser', which is not a callable, an attribute of 'UserProfileAdmin', or an attribute or method on 'api.UserProfile'.
mojcas commented 9 years ago

Please try again to makemigrations... Added fixed admin.py to match changed UserProfile mode

jurecuhalev commented 9 years ago

Closing this, as #174 already had same changes. @mojcas please correct me, if I got this wrong.