8000 chore: Bump version to v13.0.1 by surajshetty3416 · Pull Request #12798 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

chore: Bump version to v13.0.1 #12798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 5, 2021
Merged

chore: Bump version to v13.0.1 #12798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e1120ee
fix: Reload website_theme_ignore_app before Website Theme
surajshetty3416 Apr 2, 2021
7fe7206
Merge pull request #12795 from frappe/mergify/bp/version-13-pre-relea…
surajshetty3416 Apr 4, 2021
4d218fe
fix: Check if df.options exists before setting docfields
surajshetty3416 Apr 4, 2021
ea99076
Merge pull request #12797 from frappe/mergify/bp/version-13-pre-relea…
surajshetty3416 Apr 4, 2021
6b0cef7
Merge branch 'version-13' of https://github.com/frappe/frappe into ve…
surajshetty3416 Apr 4, 2021
a4b166e
chore: Bump version to v13.0.1
surajshetty3416 Apr 4, 2021
4453303
fix: Handle exception while building version comment (bp #12801) (#12…
mergify[bot] Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frappe/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
reload(sys)
sys.setdefaultencoding("utf-8")

__version__ = '13.0.0'
__version__ = '13.0.1'

__title__ = "Frappe Framework"

Expand Down
2 changes: 1 addition & 1 deletion frappe/patches/v13_0/website_theme_custom_scss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import frappe

def execute():
frappe.reload_doctype('Website Theme')
frappe.reload_doc('website', 'doctype', 'website_theme_ignore_app')
frappe.reload_doc('website', 'doctype', 'color')
frappe.reload_doctype('Website Theme')

for theme in frappe.get_all('Website Theme'):
doc = frappe.get_doc('Website Theme', theme.name)
Expand Down
26 changes: 15 additions & 11 deletions frappe/public/js/frappe/form/footer/version_timeline_content_builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,19 +151,23 @@ function get_version_comment(version_doc, text) {
let version_comment = "";
let unlinked_content = "";

Array.from($(text)).forEach(element => {
if ($(element).is('a')) {
version_comment += unlinked_content ? frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content) : "";
unlinked_content = "";
version_comment += element.outerHTML;
} else {
unlinked_content += element.outerHTML || element.textContent;
try {
Array.from($(text)).forEach(element => {
if ($(element).is('a')) {
version_comment += unlinked_content ? frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content) : "";
unlinked_content = "";
version_comment += element.outerHTML;
} else {
unlinked_content += element.outerHTML || element.textContent;
}
});
if (unlinked_content) {
version_comment += frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content);
}
});
if (unlinked_content) {
version_comment += frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content);
return version_comment;
} catch (e) {
// pass
}
return version_comment;
}
return frappe.utils.get_form_link('Version', version_doc.name, true, text);
}
Expand Down
3 changes: 2 additions & 1 deletion frappe/public/js/frappe/form/grid_row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default class GridRow {
this.on_grid_fields_dict = {};
this.on_grid_fields = [];
$.extend(this, opts);
if (this.doc) {
if (this.doc && this.parent_df.options) {
this.docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
}
this.columns = {};
Expand Down Expand Up @@ -255,6 +255,7 @@ export default class GridRow {
this.grid.visible_columns.forEach((col, ci) => {
// to get update df for the row
let df = this.docfields.find(field => field.fieldname === col[0].fieldname);

let colsize = col[1];
let txt = this.doc ?
frappe.format(this.doc[df.fieldname], df, null, this.doc) :
Expand Down
0