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

Merge with develop

Browse source
This commit is contained in:
Achilles Rasquinha 2018-03-13 17:13:03 +05:30
commit bae839fd6e
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -15,7 +15,7 @@ from past.builtins import cmp
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.1.4'
__version__ = '10.1.5'
__title__ = "Frappe Framework"
local = Local()

4
frappe/public/js/frappe/desk.js
View file

@ -237,7 +237,7 @@ frappe.Application = Class.extend({
refresh_notifications: function() {
var me = this;
if(frappe.session_alive && frappe.boot && !frappe.boot.in_setup_wizard) {
if(frappe.session_alive && frappe.boot && !(frappe.boot.home_page !== 'setup-wizard')) {
return frappe.call({
method: "frappe.desk.notifications.get_notifications",
callback: function(r) {
@ -359,7 +359,7 @@ frappe.Application = Class.extend({
},
make_nav_bar: function() {
// toolbar
if(frappe.boot && !frappe.boot.in_setup_wizard) {
if(frappe.boot && frappe.boot.home_page!=='setup-wizard') {
frappe.frappe_toolbar = new frappe.ui.toolbar.Toolbar();
}

6
frappe/public/js/frappe/list/list_item_subject.html
View file

@ -13,12 +13,14 @@
<span class="likes-count">{{ (_liked_by.length > 99 ? "99+" : _liked_by.length) || "" }}</span>
</span>
{% } %}
{% var anchor_title = (_full_title).replace(/["]/g, "&\quot;"); %}
<a class="grey list-id {{ css_seen }} ellipsis"
data-name="{{ _name }}"
href="#Form/{{ _doctype_encoded }}/{{ _name_encoded }}"
title="{{ _full_title }}">{{ strip_html(_title) }}</a>
title="{{ anchor_title }}">{{ strip_html(_title) }}</a>
{% if (_workflow && !_without_workflow) { %}
<span class="label label-{{ _workflow.style }} filterable"
data-filter="{{ _workflow.fieldname }},=,{{ _workflow.value }}">
{%= _workflow.value %}</span>
{% } %}
{% } %}

2
frappe/public/js/frappe/ui/toolbar/toolbar.js
View file

@ -220,7 +220,7 @@ frappe.ui.toolbar.Toolbar = Class.extend({
me.progress_dialog.show();
});
if (frappe.boot.is_first_startup) {
if (cint(frappe.boot.sysdefault.is_first_startup)) {
me.progress_dialog.show();
frappe.call({
method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup",

2
frappe/sessions.py
View file

@ -169,8 +169,6 @@ def get():
# check only when clear cache is done, and don't cache this
if frappe.local.request:
bootinfo["change_log"] = get_change_log()
bootinfo["in_setup_wizard"] = not cint(frappe.db.get_single_value('System Settings', 'setup_complete'))
bootinfo["is_first_startup"] = cint(frappe.db.get_single_value('System Settings', 'is_first_startup'))
bootinfo["metadata_version"] = frappe.cache().get_value("metadata_version")
if not bootinfo["metadata_version"]:

4
frappe/templates/includes/slideshow.html
View file

@ -28,10 +28,10 @@
<!-- Controls -->
<a class="left carousel-control" href="#the-carousel" data-slide="prev">
<span class="fa fa-chevron-left"></span>
<span class="fa fa-chevron-left icon"></span>
</a>
<a class="right carousel-control" href="#the-carousel" data-slide="next">
<span class="fa fa-chevron-right"></span>
<span class="fa fa-chevron-right icon"></span>
</a>
</div>