Merge pull request #78 from fproldan/backport_issue_45

[Backport version-13] feat(minor): show username instead of name email

Author: ankush

wiki/patches.txt

@@ -1,2 +1,3 @@
 wiki.wiki.doctype.wiki_page.patches.set_allow_guest
 wiki.wiki.doctype.wiki_page.patches.delete_is_new
+wiki.wiki.doctype.wiki_page_revision.patches.add_usernames

wiki/wiki/doctype/wiki_page/templates/show.html

@@ -10,7 +10,7 @@ <h1 class="m-0">{{ title }}</h1>
 		<ul class="user-contributions">
 
 			{%- if last_revision -%}
-			{{ last_revision.owner }} edited {{ frappe.utils.pretty_date(last_revision.creation) }}
+			{{ last_revision.raised_by_username or last_revision.owner }} edited {{ frappe.utils.pretty_date(last_revision.creation) }}
 			{%- if number_of_revisions > 0 %}
 			&middot;
 			<li><a href="/revisions?wiki_page={{ path }}">{{ number_of_revisions }} Revisions</a>&nbsp;</li>

wiki/wiki/doctype/wiki_page_revision/patches/__init__.py

@@ -0,0 +1,15 @@
+import frappe
+
+
+def execute():
+
+	frappe.reload_doctype("Wiki Page Revision")
+
+	revision = frappe.qb.DocType("Wiki Page Revision")
+	user = frappe.qb.DocType("User")
+
+	(frappe.qb
+			.update(revision)
+			.join(user).on(user.name == revision.raised_by)
+			.set(revision.raised_by_username, user.username)
+	).run()

wiki/wiki/doctype/wiki_page_revision/patches/add_usernames.py

@@ -8,7 +8,8 @@
   "message",
   "content",
   "wiki_page",
-  "raised_by"
+  "raised_by",
+  "raised_by_username"
  ],
  "fields": [
   {
@@ -36,11 +37,18 @@
    "fieldtype": "Link",
    "label": "Raised By",
    "options": "User"
+  },
+  {
+   "fetch_from": "raised_by.username",
+   "fieldname": "raised_by_username",
+   "fieldtype": "Data",
+   "label": "Raised By Username",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-21 14:22:44.158955",
+ "modified": "2021-11-08 19:23:41.207213",
  "modified_by": "Administrator",
  "module": "Wiki",
  "name": "Wiki Page Revision",

wiki/wiki/doctype/wiki_page_revision/wiki_page_revision.json

@@ -10,7 +10,7 @@
         <h1>{{ title }}</h1>
         <h2>{{ revision.message }}</h2>
         <p class="wiki-revision-meta">
-            {{ revision.owner }} edited on {{ frappe.utils.format_datetime(revision.creation, 'medium') }}
+            {{ revision.raised_by_username or revision.owner }} edited on {{ frappe.utils.format_datetime(revision.creation, 'medium') }}
         </p>
     </div>
     <div class="mt-6">

wiki/www/compare.html

@@ -17,11 +17,7 @@ <h1>{{ title }}</h1>
 			<a class="wiki-revision-message" href="/compare?wiki_page={{ doc.name }}&&compare={{ revision.name }}">{{
 				revision.message }}</a>
 			<p class="wiki-revision-meta">
-				{%- if revision.raised_by -%}
-				{{ revision.raised_by }}
-				{%- else -%}
-				{{revision.owner }}
-				{%- endif -%}
+				{{ revision.raised_by_username or revision.raised_by or revision.owner }}
 				&nbspedited {{ frappe.utils.pretty_date(revision.creation) }}
 			</p>
 		</li>

wiki/www/revisions.html

@@ -15,7 +15,7 @@ def get_context(context):
 	revisions = frappe.db.get_all(
 		"Wiki Page Revision",
 		filters={"wiki_page": frappe.form_dict.wiki_page},
-		fields=["message", "creation", "owner", "name", "raised_by"],
+		fields=["message", "creation", "owner", "name", "raised_by", "raised_by_username"],
 	)
 	context.revisions = revisions
 	context.no_cache = 1