vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1545 from rmehta/socket-in-website

Browse source 
[realtime] Socket working in website
This commit is contained in:
Anand Doshi 2016-01-28 11:26:29 +05:30
commit 0a2db5ed4e
7 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/public/js/frappe/socketio_client.js
View file

@ -6,6 +6,10 @@ frappe.socket = {
return;
}
if (frappe.socket.socket) {
return;
}
//Enable secure option when using HTTPS
if (window.location.protocol == "https:") {
frappe.socket.socket = io.connect(frappe.socket.get_host(), {secure: true});
@ -71,8 +75,8 @@ frappe.socket = {
}
},
get_host: function() {
var host = frappe.urllib.get_base_url();
if(frappe.boot.dev_server) {
var host = window.location.origin;
if(window.dev_server) {
parts = host.split(":");
if(parts.length > 2) {
host = parts[0] + ":" + parts[1];

1
frappe/sessions.py
View file

@ -128,7 +128,6 @@ def get():
frappe.get_attr(hook)(bootinfo=bootinfo)
bootinfo["lang"] = frappe.translate.get_user_lang()
bootinfo["dev_server"] = os.environ.get('DEV_SERVER', False)
bootinfo["disable_async"] = frappe.conf.disable_async
return bootinfo

1
frappe/templates/base.html
View file

@ -42,6 +42,7 @@
frappe.page_ready_events[location.pathname].push(fn);
}
}
window.dev_server = {{ dev_server }};
</script>
</head>
<body data-path="{{ path }}">

13
frappe/utils/data.py
View file

@ -108,7 +108,8 @@ def time_diff_in_hours(string_ed_date, string_st_date):
return round(float(time_diff(string_ed_date, string_st_date).total_seconds()) / 3600, 6)
def now_datetime():
return convert_utc_to_user_timezone(datetime.datetime.utcnow())
dt = convert_utc_to_user_timezone(datetime.datetime.utcnow())
return dt.replace(tzinfo=None)
def _get_time_zone():
time_zone = (frappe.db.get_single_value("System Settings", "time_zone")
@ -275,7 +276,7 @@ def rounded(num, precision=0):
num = round(num)
return (num / multiplier) if precision else num
def remainder(numerator, denominator, precision=2):
precision = cint(precision)
multiplier = 10 ** precision
@ -284,13 +285,13 @@ def remainder(numerator, denominator, precision=2):
_remainder = ((numerator * multiplier) % (denominator * multiplier)) / multiplier
else:
_remainder = numerator % denominator
return flt(_remainder, precision);
def round_based_on_smallest_currency_fraction(value, currency, precision=2):
smallest_currency_fraction_value = flt(frappe.db.get_value("Currency",
smallest_currency_fraction_value = flt(frappe.db.get_value("Currency",
currency, "smallest_currency_fraction_value"))
if smallest_currency_fraction_value:
remainder_val = remainder(value, smallest_currency_fraction_value, precision)
if remainder_val > (smallest_currency_fraction_value / 2):
@ -299,7 +300,7 @@ def round_based_on_smallest_currency_fraction(value, currency, precision=2):
value -= remainder_val
else:
value = rounded(value)
return flt(value, precision)
def encode(obj, encoding="utf-8"):

4
frappe/utils/jinja.py
View file

@ -29,6 +29,7 @@ def render_template(template, context, is_path=None):
return get_jenv().from_string(template).render(context)
def get_allowed_functions_for_jenv():
import os
import frappe
import frappe.utils
import frappe.utils.data
@ -87,7 +88,8 @@ def get_allowed_functions_for_jenv():
"_": frappe._,
"get_shade": get_shade,
"scrub": scrub,
"guess_mimetype": mimetypes.guess_type
"guess_mimetype": mimetypes.guess_type,
"dev_server": os.environ.get('DEV_SERVER', False)
}
def get_jloader():

5
frappe/website/doctype/web_form/web_form.py
View file

@ -7,7 +7,6 @@ from frappe.website.website_generator import WebsiteGenerator
from frappe import _
from frappe.utils.file_manager import save_file, remove_file_by_url
from frappe.website.utils import get_comment_list
from frappe.model import default_fields
from frappe.custom.doctype.customize_form.customize_form import docfield_properties
class WebForm(WebsiteGenerator):
@ -37,7 +36,9 @@ class WebForm(WebsiteGenerator):
continue
for prop in docfield_properties:
if df.fieldtype==meta_df.fieldtype and prop != "idx":
if df.fieldtype==meta_df.fieldtype and prop not in ("idx",
"reqd", "default", "description", "default", "options",
"hidden", "read_only", "label"):
df.set(prop, meta_df.get(prop))
if df.fieldtype == "Link":

1
frappe/website/js/website.js
View file

@ -3,6 +3,7 @@
frappe.provide("website");
frappe.provide("frappe.search_path");
cur_frm = null;
$.extend(frappe, {
boot: {},