Merge branch 'dev' of github.com:webnotes/wnframework into dev

This commit is contained in:
Nabin Hait 2012-07-13 11:19:33 +05:30
commit 572b21c5fb
3 changed files with 30 additions and 13 deletions

View file

@ -7,17 +7,33 @@ Listen 8080
# Set your root folder here
DocumentRoot /var/www/html/
<Directory />
AllowOverride All
Order allow,deny
AddHandler cgi-script .cgi .xml .py
<Directory "/Library/WebServer/Documents/webnotes/erpnext/public">
# directory specific options
Options -Indexes +FollowSymLinks +ExecCGI
# directory's index file
DirectoryIndex web.py
# rewrite rule
RewriteEngine on
# condition 1:
# ignore login-page.html, app.html, blank.html, unsupported.html
RewriteCond %{REQUEST_URI} ^((?!app\.html|blank\.html|unsupported\.html).)*$
# condition 2: if there are no slashes
# and file is .html or does not containt a .
RewriteCond %{REQUEST_URI} ^(?!.+/)((.+\.html)|([^.]+))$
# rewrite if both of the above conditions are true
RewriteRule ^(.+)$ web.py?page=$1 [NC,L]
AllowOverride all
Order Allow,Deny
Allow from all
Options -Indexes +ExecCGI +FollowLinks
AddHandler cgi-script
DirectoryIndex index.cgi index.html
RewriteEngine On
</Directory>
</VirtualHost>

View file

@ -136,7 +136,7 @@ function check_required(dt, dn, parent_dt) {
if(fl[i].fieldtype=='Table') {
var no_value = true;
$.each(locals[fl[i].options], function(k,d) {
$.each(locals[fl[i].options] || {}, function(k,d) {
if(d.parent==doc.name && d.parenttype==doc.doctype && d.parentfield==fl[i].fieldname) {
no_value = false;
}

View file

@ -16,7 +16,8 @@ wn.ui.AppFrame = Class.extend({
},
title: function(txt) {
this.$titlebar.find('.appframe-title').html(txt);
this.clear_breadcrumbs();
this.add_breadcrumb(txt);
},
make_toolbar: function() {
if(!this.$w.find('.appframe-toolbar').length)