Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser

This commit is contained in:
Prateeksha Singh 2018-09-03 17:32:17 +05:30
commit ad6948844e
3 changed files with 13 additions and 41 deletions

View File

@ -142,7 +142,7 @@ def publish_selected_items(items_to_publish):
try:
item_sync_preprocess(len(items))
load_base64_image_from_items(items)
convert_relative_image_urls_to_absolute(items)
# TODO: Publish Progress
connection = get_hub_connection()
@ -183,29 +183,14 @@ def item_sync_postprocess():
frappe.db.set_value('Marketplace Settings', 'Marketplace Settings', 'sync_in_progress', 0)
def load_base64_image_from_items(items):
def convert_relative_image_urls_to_absolute(items):
from urlparse import urljoin
for item in items:
file_path = item['image']
file_name = os.path.basename(file_path)
base64content = None
if file_path.startswith('http'):
# fetch content and then base64 it
url = file_path
response = requests.get(url)
base64content = base64.b64encode(response.content)
else:
# read file then base64 it
file_path = os.path.abspath(get_file_path(file_path))
with io.open(file_path, 'rb') as f:
base64content = base64.b64encode(f.read())
image_data = json.dumps({
'file_name': file_name,
'base64': base64content
})
item['image'] = image_data
if file_path.startswith('/files/'):
item['image'] = urljoin(frappe.utils.get_url(), file_path)
def get_hub_connection():

View File

@ -1,28 +1,15 @@
const ProfileDialog = (title = __('Edit Profile'), action={}) => {
const fields = [
{
fieldname: 'company_email',
label: __('Email'),
fieldtype: 'Read Only'
},
{
fieldtype: 'Link',
fieldname: 'company',
label: __('Company'),
options: 'Company',
onchange: () => {
const value = dialog.get_value('company');
if (value) {
frappe.db.get_doc('Company', value)
.then(company => {
console.log(company.company_logo);
dialog.set_values({
company_logo: company.company_logo,
company_description: company.company_description
});
});
}
}
options: 'Company'
},
{
fieldtype: 'Read Only',
fieldname: 'email',
label: __('Email')
},
{
label: __('About your company'),

View File

@ -22,7 +22,7 @@
</section-header>
<item-cards-container
:container_name="page_title"
:container_name="__('Published Items')"
:items="items"
:item_id_fieldname="item_id_fieldname"
:on_click="go_to_item_details_page"