vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #14182 from gavindsouza/misc-fixes-0

Browse source 
fix: Misc fixes
This commit is contained in:
gavin 2021-09-13 17:12:00 +05:30 • committed by GitHub
commit 1717bddfb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
frappe/data/sample_site_config.json
View file

@ -1,45 +0,0 @@
{
"db_name": "testdb",
"db_password": "password",
"mute_emails": true,
"limits": {
"emails": 1500,
"space": 0.157,
"expiry": "2016-07-25",
"users": 1
},
"developer_mode": 1,
"auto_cache_clear": true,
"disable_website_cache": true,
"max_file_size": 1000000,
"mail_server": "localhost",
"mail_login": null,
"mail_password": null,
"mail_port": 25,
"use_ssl": 0,
"auto_email_id": "hello@example.com",
"google_analytics_id": "google_analytics_id",
"google_analytics_anonymize_ip": 1,
"google_login": {
"client_id": "google_client_id",
"client_secret": "google_client_secret"
},
"github_login": {
"client_id": "github_client_id",
"client_secret": "github_client_secret"
},
"facebook_login": {
"client_id": "facebook_client_id",
"client_secret": "facebook_client_secret"
},
"celery_broker": "redis://localhost",
"celery_result_backend": null,
"scheduler_interval": 300,
"celery_queue_per_site": true
}

6
frappe/public/js/frappe/form/footer/form_timeline.js
View file

@ -147,7 +147,9 @@ class FormTimeline extends BaseTimeline {
}
get_user_link(user) {
const user_display_text = (frappe.user_info(user).fullname || '').bold();
const user_display_text = (
(frappe.session.user == user ? "You" : frappe.user_info(user).fullname) || ''
).bold();
return frappe.utils.get_form_link('User', user, true, user_display_text);
}
@ -353,7 +355,7 @@ class FormTimeline extends BaseTimeline {
icon: 'branch',
icon_size: 'sm',
creation: workflow_log.creation,
content: __(workflow_log.content),
content: `${this.get_user_link(workflow_log.owner)} ${__(workflow_log.content)}`,
title: "Workflow",
});
});