Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
仰若水
frappe
Commits
8d16ecfd
Commit
8d16ecfd
authored
7 years ago
by
Saurabh
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
fe60f8e5
5036cafb
develop
v11.1.5
v11.1.4
v11.1.3
v11.1.2
v11.1.1
v11.1.0
v11.0.3
v11.0.3-beta.51
v11.0.3-beta.50
v11.0.3-beta.49
v11.0.3-beta.48
v11.0.3-beta.47
v11.0.3-beta.46
v11.0.3-beta.45
v11.0.3-beta.44
v11.0.3-beta.43
v11.0.3-beta.42
v11.0.3-beta.41
v11.0.3-beta.40
v11.0.3-beta.39
v11.0.3-beta.38
v11.0.3-beta.37
v11.0.3-beta.36
v11.0.3-beta.35
v11.0.3-beta.34
v11.0.3-beta.33
v11.0.3-beta.32
v11.0.3-beta.31
v11.0.3-beta.30
v11.0.3-beta.29
v11.0.3-beta.28
v11.0.3-beta.27
v11.0.3-beta.26
v11.0.3-beta.25
v11.0.3-beta.24
v11.0.3-beta.23
v11.0.3-beta.22
v11.0.3-beta.21
v11.0.3-beta.20
v11.0.3-beta.19
v11.0.3-beta.18
v11.0.3-beta.17
v11.0.3-beta.16
v11.0.3-beta.15
v11.0.3-beta.14
v11.0.3-beta.13
v11.0.3-beta.12
v11.0.3-beta.11
v11.0.3-beta.10
v11.0.3-beta.9
v11.0.3-beta.8
v11.0.3-beta.7
v11.0.3-beta.6
v11.0.3-beta.5
v11.0.3-beta.4
v11.0.3-beta.3
v11.0.3-beta.2
v11.0.3-beta.1
v11.0.2
v11.0.1
v11.0.0-beta
v10.1.71
v10.1.70
v10.1.69
v10.1.68
v10.1.67
v10.1.66
v10.1.65
v10.1.64
v10.1.63
v10.1.62
v10.1.61
v10.1.60
v10.1.59
v10.1.58
v10.1.57
v10.1.56
v10.1.55
v10.1.54
v10.1.53
v10.1.52
v10.1.51
v10.1.50
v10.1.49
v10.1.49-beta.1
v10.1.48
v10.1.47
v10.1.46
v10.1.45
v10.1.44
v10.1.43
v10.1.42
v10.1.41
v10.1.40
v10.1.39
v10.1.38
v10.1.37
v10.1.36
v10.1.35
v10.1.34
v10.1.33
v10.1.32
v10.1.31
v10.1.30
v10.1.29
v10.1.28
v10.1.27
v10.1.26
v10.1.25
v10.1.24
v10.1.23
v10.1.22
v10.1.21
v10.1.20
v10.1.19
v10.1.18
v10.1.17
v10.1.16
v10.1.15
v10.1.14
v10.1.13
v10.1.12
v10.1.11
v10.1.10
v10.1.9
v10.1.8
v10.1.7
v10.1.6
v10.1.5
v10.1.4
v10.1.3
v10.1.2
v10.1.1
v10.1.0
v10.0.25
v10.0.24
v10.0.23
v10.0.22
v10.0.21
v10.0.20
v10.0.19
v10.0.18
v10.0.17
v10.0.16
v10.0.15
v10.0.14
v10.0.13
v10.0.12
v10.0.11
v10.0.10
v10.0.9
v10.0.8
v10.0.7
v10.0.6
v10.0.5
v10.0.4
v10.0.3
v10.0.2
v10.0.1
v10.0.0
v9.2.25
v9.2.24
v9.2.23
v9.2.22
v9.2.21
v9.2.20
v9.2.19
v9.2.18
v9.2.17
v9.2.16
v9.2.15
v9.2.14
v9.2.13
v9.2.12
v9.2.11
v9.2.10
v9.2.9
v9.2.8
v9.2.7
v9.2.6
v9.2.5
v9.2.4
v9.2.3
v9.2.2
v9.2.1
v9.2.0
v9.1.11
v9.1.10
v9.1.9
v9.1.8
v9.1.7
v9.1.6
v9.1.5
v9.1.4
v9.1.3
v9.1.2
v9.1.1
v9.1.0
v9.0.10
v9.0.9
v9.0.8
v9.0.7
v9.0.6
v9.0.5
v9.0.4
v9.0.3
v9.0.2
v9.0.1
v9.0.0
v8.10.9
v8.10.8
v8.10.7
v8.10.6
v8.10.5
v8.10.4
v8.10.3
v8.10.2
v8.10.1
v8.10.0
v8.9.4
v8.9.3
v8.9.2
v8.9.1
v8.9.0
v8.8.5
v8.8.4
v8.8.3
v8.8.2
v8.8.1
v8.8.0
v8.7.11
v8.7.10
v8.7.9
v8.7.8
v8.7.7
v8.7.6
v8.7.5
v8.7.4
v8.7.3
v8.7.2
v8.7.1
v8.7.0
v8.6.8
v8.6.7
v8.6.6
v8.6.5
v8.6.4
v8.6.3
v8.6.2
v8.6.1
v8.6.0
v8.5.8
v8.5.7
v8.5.6
v8.5.5
v8.5.4
v8.5.3
v8.5.2
v8.5.1
v8.5.0
v8.4.1
v8.4.0
v8.3.10
v8.3.9
v8.3.8
v8.3.7
v8.3.6
v8.3.5
v8.3.4
v8.3.3
v8.3.2
v8.3.1
v8.3.0
v8.2.7
v8.2.6
v8.2.5
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
frappe/__init__.py
+1
-1
frappe/__init__.py
frappe/public/js/frappe/ui/base_list.js
+28
-25
frappe/public/js/frappe/ui/base_list.js
frappe/public/js/frappe/views/communication.js
+4
-4
frappe/public/js/frappe/views/communication.js
with
33 additions
and
30 deletions
+33
-30
frappe/__init__.py
View file @
8d16ecfd
...
...
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from
.exceptions
import
*
from
.utils.jinja
import
get_jenv
,
get_template
,
render_template
__version__
=
'8.2.
4
'
__version__
=
'8.2.
5
'
__title__
=
"Frappe Framework"
local
=
Local
()
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/ui/base_list.js
View file @
8d16ecfd
...
...
@@ -184,32 +184,35 @@ frappe.ui.BaseList = Class.extend({
return
;
}
this
.
page
.
add_field
({
fieldtype
:
'
Link
'
,
options
:
this
.
doctype
,
label
:
'
ID
'
,
fieldname
:
'
name
'
,
onchange
:
()
=>
{
me
.
refresh
(
true
);
}
});
this
.
meta
.
fields
.
forEach
(
function
(
df
)
{
if
(
df
.
in_standard_filter
&&
!
frappe
.
model
.
no_value_type
.
includes
(
df
.
fieldtype
))
{
if
(
df
.
fieldtype
==
"
Select
"
&&
df
.
options
)
{
var
options
=
df
.
options
.
split
(
"
\n
"
)
if
(
options
.
length
>
0
&&
options
[
0
]
!=
""
){
options
.
unshift
(
""
);
df
.
options
=
options
.
join
(
"
\n
"
);
if
(
this
.
meta
)
{
this
.
page
.
add_field
({
fieldtype
:
'
Link
'
,
options
:
this
.
doctype
,
label
:
'
ID
'
,
fieldname
:
'
name
'
,
onchange
:
()
=>
{
me
.
refresh
(
true
);
}
});
this
.
meta
.
fields
.
forEach
(
function
(
df
)
{
if
(
df
.
in_standard_filter
&&
!
frappe
.
model
.
no_value_type
.
includes
(
df
.
fieldtype
))
{
let
options
=
df
.
options
;
if
(
df
.
fieldtype
==
"
Select
"
&&
df
.
options
)
{
options
=
df
.
options
.
split
(
"
\n
"
)
if
(
options
.
length
>
0
&&
options
[
0
]
!=
""
){
options
.
unshift
(
""
);
df
.
options
=
options
.
join
(
"
\n
"
);
}
}
me
.
page
.
add_field
({
fieldtype
:
df
.
fieldtype
,
label
:
__
(
df
.
label
),
options
:
df
.
options
,
fieldname
:
df
.
fieldname
,
onchange
:
()
=>
{
me
.
refresh
(
true
);}
});
}
me
.
page
.
add_field
({
fieldtype
:
df
.
fieldtype
,
label
:
__
(
df
.
label
),
options
:
df
.
options
,
fieldname
:
df
.
fieldname
,
onchange
:
()
=>
{
me
.
refresh
(
true
);}
});
}
});
});
}
this
.
page
.
page_form
.
on
(
'
change
'
,
'
:input
'
,
function
()
{
me
.
refresh
(
true
);
...
...
@@ -506,4 +509,4 @@ frappe.ui.BaseList = Class.extend({
}
});
}
});
\ No newline at end of file
});
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/views/communication.js
View file @
8d16ecfd
...
...
@@ -156,8 +156,9 @@ frappe.views.CommunicationComposer = Class.extend({
setup_standard_reply
:
function
()
{
var
me
=
this
;
this
.
dialog
.
get_input
(
"
standard_reply
"
).
on
(
"
change
"
,
function
()
{
var
standard_reply
=
$
(
this
).
val
();
this
.
dialog
.
fields_dict
[
"
standard_reply
"
].
df
.
onchange
=
()
=>
{
var
standard_reply
=
me
.
dialog
.
fields_dict
.
standard_reply
.
$input
.
val
();
var
prepend_reply
=
function
(
reply
)
{
if
(
me
.
reply_added
===
standard_reply
)
{
...
...
@@ -194,8 +195,7 @@ frappe.views.CommunicationComposer = Class.extend({
prepend_reply
(
r
.
message
);
}
});
});
}
},
setup_last_edited_communication
:
function
()
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help