Rafał Pitoń 8 years ago
parent
commit
6e985b52db

+ 4 - 1
misago/datamover/markup/attachments.py

@@ -25,7 +25,10 @@ def update_thumb_url(matchobj):
     hash = matchobj.group('hash')
     hash = matchobj.group('hash')
     attachment = get_attachment_for_hash(hash)
     attachment = get_attachment_for_hash(hash)
     if attachment:
     if attachment:
-        return attachment.get_thumbnail_url()
+        if attachment.thumbnail:
+            return attachment.get_thumbnail_url()
+        else:
+            return attachment.get_absolute_url()
     return matchobj.group(0)
     return matchobj.group(0)
 
 
 
 

+ 1 - 3
misago/datamover/settings.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from misago.conf import db_settings
 from misago.conf import db_settings
 from misago.conf.models import Setting
 from misago.conf.models import Setting
 
 
-from . import defstdout, fetch_assoc
+from . import fetch_assoc
 
 
 
 
 def copy_value(setting):
 def copy_value(setting):
@@ -80,8 +80,6 @@ SETTING_CONVERTER = {
 
 
 
 
 def move_settings(stdout=None):
 def move_settings(stdout=None):
-    stdout = stdout or defstdout
-
     for row in fetch_assoc('SELECT * FROM misago_setting'):
     for row in fetch_assoc('SELECT * FROM misago_setting'):
         setting_key = row['setting']
         setting_key = row['setting']
         if setting_key in SETTING_CONVERTER:
         if setting_key in SETTING_CONVERTER:

+ 1 - 1
misago/datamover/users.py

@@ -33,7 +33,7 @@ def move_users(stdout, style):
                 new_user = UserModel.objects.create_user(
                 new_user = UserModel.objects.create_user(
                     user['username'], user['email'], 'Pass.123')
                     user['username'], user['email'], 'Pass.123')
             except ValidationError:
             except ValidationError:
-                new_name = ''.join([user['username'], get_random_string(4)])
+                new_name = ''.join([user['username'][:10], get_random_string(4)])
                 new_user = UserModel.objects.create_user(
                 new_user = UserModel.objects.create_user(
                     new_name, user['email'], 'Pass.123')
                     new_name, user['email'], 'Pass.123')