[allura] 12/50: [#7935] Added support for anonymous users

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 9986f6e7809cce20ed234bc67544fdcfe61fe145
Author: Fahri Korkmaz <f....@codesys.com>
AuthorDate: Fri Feb 28 15:44:03 2020 +0100

    [#7935] Added support for anonymous users
---
 ForgeImporters/forgeimporters/forge/discussion.py | 29 ++++++++++-------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/ForgeImporters/forgeimporters/forge/discussion.py b/ForgeImporters/forgeimporters/forge/discussion.py
index be575b6..304ed25 100644
--- a/ForgeImporters/forgeimporters/forge/discussion.py
+++ b/ForgeImporters/forgeimporters/forge/discussion.py
@@ -35,6 +35,7 @@ from allura.lib.plugin import ImportIdConverter
 from forgediscussion import utils, import_support
 from forgediscussion import model as DM
 
+
 class ForgeDiscussionImportForm(ToolImportForm):
     discussions_json = v.JsonFile(not_empty=True)
 
@@ -188,34 +189,30 @@ class ForgeDiscussionImporter(ToolImporter):
 
 
     def annotate(self, text, user, username, label=''):
-        if username and user.is_anonymous() and username != 'nobody':
+        if username and user.is_anonymous() and username != 'nobody' and username != '*anonymous':
             return '*Originally%s by:* %s\n\n%s' % (label, username, text)
         return text
 
 
     def add_posts(self, thread, posts, app):
         for post_json in posts:
-            print("Author: ", post_json["author"])
-            user = self.get_user(post_json["author"])
-            print("User", user)
+            username = post_json["author"]
+            print("Author: " + str(username))
+            user = self.get_user(username)
+            print("User: " + str(user))
             with h.push_config(c, user=user, app=app):
                 p = thread.add_post(
                         subject=post_json['subject'],
-                        text=post_json['text'], 
-                        ignore_security=True,
+                        text=self.annotate(post_json['text'], user, username, " created"),
+                        timestamp=parse(post_json["timestamp"]),
+                        ignore_security=True
                 )
 
-                if "slug" in post_json.keys():
-                    p.slug = post_json['slug']
                 if "last_edited" in post_json and post_json["last_edited"] != None:
                     print("Last edited: " + str(post_json["last_edited"]))
                     p.last_edit_date = parse(post_json["last_edited"])
-                if "timestamp" in post_json:
-                    p.timestamp = parse(post_json["timestamp"])
-
-                try:
-                    p.add_multiple_attachments([File(a['url'])
-                                                for a in post_json['attachments']])
-                except:
-                    print("Could not add attachemtns to post")
+                if "slug" in post_json.keys():
+                    p.slug = post_json['slug']
+
+                p.add_multiple_attachments([File(a["url"]) for a in post_json["attachments"]])