mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-12 17:51:20 +00:00
[website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..)
This commit is contained in:
@@ -46,8 +46,6 @@ def get_blog_list(start=0, by=None, category=None):
|
||||
if not res['content']:
|
||||
res['content'] = website.utils.get_html(res['page_name'])
|
||||
res['content'] = res['content'][:140]
|
||||
if res.avatar and not "/" in res.avatar:
|
||||
res.avatar = "files/" + res.avatar
|
||||
|
||||
return result
|
||||
|
||||
@@ -133,9 +131,6 @@ def get_blog_template_args():
|
||||
def get_writers_args():
|
||||
bloggers = webnotes.conn.sql("""select * from `tabBlogger`
|
||||
order by posts desc""", as_dict=1)
|
||||
for blogger in bloggers:
|
||||
if blogger.avatar and not "/" in blogger.avatar:
|
||||
blogger.avatar = "files/" + blogger.avatar
|
||||
|
||||
args = {
|
||||
"bloggers": bloggers,
|
||||
|
||||
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
|
||||
|
||||
import webnotes
|
||||
from webnotes.utils import cstr
|
||||
from website.utils import build_html, url_for_website, delete_page_cache
|
||||
from website.utils import build_html, delete_page_cache
|
||||
|
||||
|
||||
@webnotes.whitelist(allow_guest=True)
|
||||
@@ -90,7 +90,6 @@ def scrub_item_for_list(r):
|
||||
r.website_description = "No description given"
|
||||
if len(r.website_description.split(" ")) > 24:
|
||||
r.website_description = " ".join(r.website_description.split(" ")[:24]) + "..."
|
||||
r.website_image = url_for_website(r.website_image)
|
||||
|
||||
def get_parent_item_groups(item_group_name):
|
||||
item_group = webnotes.doc("Item Group", item_group_name)
|
||||
|
||||
@@ -20,7 +20,4 @@ def get_slideshow(obj):
|
||||
slideshow = webnotes.bean("Website Slideshow", obj.doc.slideshow)
|
||||
obj.slides = slideshow.doclist.get({"doctype":"Website Slideshow Item"})
|
||||
obj.doc.slideshow_header = slideshow.doc.header or ""
|
||||
for s in obj.slides:
|
||||
if s.image and not s.image.lower().startswith("http"):
|
||||
s.image = "files/" + s.image
|
||||
|
||||
Reference in New Issue
Block a user