# HG changeset patch
# User cin
# Date 1392066400 -14400
# Node ID 4bdf155e5bfe4464e392c77d9a08f1cb52d4805b
# Parent  0d63f5273307e3128d24f1068137acf3553f95cb# Parent  4edd360250511eee2945937df53f4e2e1e63e076
Слияние

diff -r 4edd36025051 -r 4bdf155e5bfe Lib/IMPL/Code/BasePropertyImplementor.pm
--- a/Lib/IMPL/Code/BasePropertyImplementor.pm	Mon Feb 10 17:41:34 2014 +0400
+++ b/Lib/IMPL/Code/BasePropertyImplementor.pm	Tue Feb 11 01:06:40 2014 +0400
@@ -40,15 +40,19 @@
 sub NormalizeSpecification {
 	my ($this,$spec) = @_;
 	
-	return ref $spec
-        ? $spec
-        : {
+	return $spec if ref($spec);
+	
+	if (looks_like_number($spec)) {
+		return {
             get => $spec & PROP_GET,
             set => $spec & PROP_SET,
             isList => $spec & PROP_LIST,
             ownerSet => (($spec & PROP_OWNERSET) == PROP_OWNERSET),
             direct => $spec & PROP_DIRECT
-        };	    
+        };
+	} else {
+		return {};
+	}	    
 }
 
 sub CreateFactoryId {
diff -r 4edd36025051 -r 4bdf155e5bfe Lib/IMPL/Web/View/Metadata/FormMeta.pm
--- a/Lib/IMPL/Web/View/Metadata/FormMeta.pm	Mon Feb 10 17:41:34 2014 +0400
+++ b/Lib/IMPL/Web/View/Metadata/FormMeta.pm	Tue Feb 11 01:06:40 2014 +0400
@@ -214,8 +214,8 @@
 		die ArgException->new(model => "A node is required")
 			unless is($model,DOMNode);
 		
-		$args->{decl} ||= $model->schemaSource;
-		$args->{schema} ||= $model->schema; 
+		$args->{decl} ||= $model->schemaNode;
+		$args->{schema} ||= $model->schemaType; 
 	}
 	
 	return $self->new(