update file urls
This commit is contained in:
parent
69b3730a18
commit
24a69613e0
@ -32,7 +32,7 @@ erpnext.ActivityFeed = Class.extend({
|
|||||||
},
|
},
|
||||||
scrub_data: function(data) {
|
scrub_data: function(data) {
|
||||||
data.by = wn.user_info(data.owner).fullname;
|
data.by = wn.user_info(data.owner).fullname;
|
||||||
data.imgsrc = wn.user_info(data.owner).image;
|
data.imgsrc = wn.utils.get_file_link(wn.user_info(data.owner).image);
|
||||||
|
|
||||||
// feedtype
|
// feedtype
|
||||||
if(!data.feed_type) {
|
if(!data.feed_type) {
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
{
|
{
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"creation": "2012-12-07 15:15:29",
|
"creation": "2012-12-06 15:57:02",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"modified": "2012-12-07 15:44:48"
|
"modified": "2012-12-11 15:56:37"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_attach": 1,
|
"allow_attach": 1,
|
||||||
@ -14,6 +14,7 @@
|
|||||||
"description": "A Product or a Service that is bought, sold or kept in stock.",
|
"description": "A Product or a Service that is bought, sold or kept in stock.",
|
||||||
"autoname": "field:item_code",
|
"autoname": "field:item_code",
|
||||||
"name": "__common__",
|
"name": "__common__",
|
||||||
|
"default_print_format": "Standard",
|
||||||
"allow_rename": 1,
|
"allow_rename": 1,
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
"max_attachments": 1
|
"max_attachments": 1
|
||||||
@ -131,6 +132,14 @@
|
|||||||
"fieldtype": "Column Break",
|
"fieldtype": "Column Break",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"doctype": "DocField",
|
||||||
|
"label": "Image",
|
||||||
|
"options": "attach_files:",
|
||||||
|
"fieldname": "image",
|
||||||
|
"fieldtype": "Select",
|
||||||
|
"permlevel": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"oldfieldtype": "Text",
|
"oldfieldtype": "Text",
|
||||||
"doctype": "DocField",
|
"doctype": "DocField",
|
||||||
@ -768,72 +777,23 @@
|
|||||||
"doctype": "DocField",
|
"doctype": "DocField",
|
||||||
"label": "Short Description",
|
"label": "Short Description",
|
||||||
"fieldname": "web_short_description",
|
"fieldname": "web_short_description",
|
||||||
"fieldtype": "Small Text",
|
"fieldtype": "Text",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"depends_on": "show_in_website",
|
"depends_on": "show_in_website",
|
||||||
"doctype": "DocField",
|
"doctype": "DocField",
|
||||||
"label": "Long Description",
|
"label": "Long Description",
|
||||||
|
"options": "Markdown",
|
||||||
"fieldname": "web_long_description",
|
"fieldname": "web_long_description",
|
||||||
"fieldtype": "Text Editor",
|
"fieldtype": "Text Editor",
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"description": "These details will be shown in a formatted table the page for this product.",
|
|
||||||
"depends_on": "show_in_website",
|
|
||||||
"doctype": "DocField",
|
|
||||||
"label": "Item Website Specifications",
|
|
||||||
"options": "Item Website Specification",
|
|
||||||
"fieldname": "item_website_specifications",
|
|
||||||
"fieldtype": "Table",
|
|
||||||
"permlevel": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"amend": 0,
|
|
||||||
"create": 0,
|
|
||||||
"doctype": "DocPerm",
|
|
||||||
"submit": 0,
|
|
||||||
"write": 0,
|
|
||||||
"cancel": 0,
|
|
||||||
"role": "Material Manager",
|
|
||||||
"permlevel": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"amend": 0,
|
|
||||||
"create": 0,
|
|
||||||
"doctype": "DocPerm",
|
|
||||||
"submit": 0,
|
|
||||||
"write": 0,
|
|
||||||
"cancel": 0,
|
|
||||||
"role": "Material Manager",
|
|
||||||
"permlevel": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"amend": 0,
|
|
||||||
"create": 0,
|
|
||||||
"doctype": "DocPerm",
|
|
||||||
"submit": 0,
|
|
||||||
"write": 0,
|
|
||||||
"cancel": 0,
|
|
||||||
"role": "Material User",
|
|
||||||
"permlevel": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"amend": 0,
|
|
||||||
"create": 0,
|
|
||||||
"doctype": "DocPerm",
|
|
||||||
"submit": 0,
|
|
||||||
"write": 0,
|
|
||||||
"cancel": 0,
|
|
||||||
"role": "Material User",
|
|
||||||
"permlevel": 0
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"create": 1,
|
"create": 1,
|
||||||
"doctype": "DocPerm",
|
"doctype": "DocPerm",
|
||||||
"write": 1,
|
"write": 1,
|
||||||
"role": "Material Master Manager",
|
"role": "System Manager",
|
||||||
"cancel": 1,
|
"cancel": 1,
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
@ -848,7 +808,7 @@
|
|||||||
"create": 1,
|
"create": 1,
|
||||||
"doctype": "DocPerm",
|
"doctype": "DocPerm",
|
||||||
"write": 1,
|
"write": 1,
|
||||||
"role": "System Manager",
|
"role": "Material Master Manager",
|
||||||
"cancel": 1,
|
"cancel": 1,
|
||||||
"permlevel": 0
|
"permlevel": 0
|
||||||
},
|
},
|
||||||
@ -856,5 +816,45 @@
|
|||||||
"doctype": "DocPerm",
|
"doctype": "DocPerm",
|
||||||
"role": "System Manager",
|
"role": "System Manager",
|
||||||
"permlevel": 1
|
"permlevel": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"amend": 0,
|
||||||
|
"create": 0,
|
||||||
|
"doctype": "DocPerm",
|
||||||
|
"submit": 0,
|
||||||
|
"write": 0,
|
||||||
|
"role": "Material Manager",
|
||||||
|
"cancel": 0,
|
||||||
|
"permlevel": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"amend": 0,
|
||||||
|
"create": 0,
|
||||||
|
"doctype": "DocPerm",
|
||||||
|
"submit": 0,
|
||||||
|
"write": 0,
|
||||||
|
"role": "Material Manager",
|
||||||
|
"cancel": 0,
|
||||||
|
"permlevel": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"amend": 0,
|
||||||
|
"create": 0,
|
||||||
|
"doctype": "DocPerm",
|
||||||
|
"submit": 0,
|
||||||
|
"write": 0,
|
||||||
|
"role": "Material User",
|
||||||
|
"cancel": 0,
|
||||||
|
"permlevel": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"amend": 0,
|
||||||
|
"create": 0,
|
||||||
|
"doctype": "DocPerm",
|
||||||
|
"submit": 0,
|
||||||
|
"write": 0,
|
||||||
|
"role": "Material User",
|
||||||
|
"cancel": 0,
|
||||||
|
"permlevel": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
@ -88,7 +88,7 @@ erpnext.Messages = Class.extend({
|
|||||||
$('#message-title').html(contact==user ? "Everyone" :
|
$('#message-title').html(contact==user ? "Everyone" :
|
||||||
wn.user_info(contact).fullname)
|
wn.user_info(contact).fullname)
|
||||||
|
|
||||||
$('#avatar-image').attr("src", wn.user_info(contact).image);
|
$('#avatar-image').attr("src", wn.utils.get_file_link(wn.user_info(contact).image));
|
||||||
|
|
||||||
$("#show-everyone").toggle(contact!=user);
|
$("#show-everyone").toggle(contact!=user);
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ erpnext.Messages = Class.extend({
|
|||||||
|
|
||||||
data.creation = dateutil.comment_when(data.creation);
|
data.creation = dateutil.comment_when(data.creation);
|
||||||
data.comment_by_fullname = wn.user_info(data.owner).fullname;
|
data.comment_by_fullname = wn.user_info(data.owner).fullname;
|
||||||
data.image = wn.user_info(data.owner).image;
|
data.image = wn.utils.get_file_link(wn.user_info(data.owner).image);
|
||||||
data.mark_html = "";
|
data.mark_html = "";
|
||||||
|
|
||||||
data.reply_html = '';
|
data.reply_html = '';
|
||||||
@ -190,7 +190,7 @@ erpnext.Messages = Class.extend({
|
|||||||
var p = r.message[i];
|
var p = r.message[i];
|
||||||
if(p.name != user) {
|
if(p.name != user) {
|
||||||
p.fullname = wn.user_info(p.name).fullname;
|
p.fullname = wn.user_info(p.name).fullname;
|
||||||
p.image = wn.user_info(p.name).image;
|
p.image = wn.utils.get_file_link(wn.user_info(p.name).image);
|
||||||
p.name = p.name.replace('@', '__at__');
|
p.name = p.name.replace('@', '__at__');
|
||||||
p.status_color = p.has_session ? "green" : "#ddd";
|
p.status_color = p.has_session ? "green" : "#ddd";
|
||||||
p.status = p.has_session ? "Online" : "Offline";
|
p.status = p.has_session ? "Online" : "Offline";
|
||||||
|
Loading…
Reference in New Issue
Block a user