Merge branch 'current_branch' into 'dev'

migrate update

See merge request !24
feature/fix_generate_pass
Andrey 8 years ago
commit abd338f513
  1. 4
      csv/load_comments.py

@ -58,7 +58,7 @@ if __name__ == '__main__':
comment_exist = Comment.objects.filter(
text=row['text'] or row['bb_text'],
user_key=get_user_model().objects.get(email=row['owner__email']).out_key,
date=row['start_date']
date=row['date']
).exists()
if not comment_exist:
@ -69,7 +69,7 @@ if __name__ == '__main__':
if row['status'] == 'Одобренно':
p.status = ProgressLesson.STATUSES.done
p.finish_date = row['finish_date']
p.finish_date = row['date']
elif row['status'] == 'Отклонено':
p.status = ProgressLesson.STATUSES.fail

Loading…
Cancel
Save