[Quickfw-git] SF.net Git: quickfw branch, master, updated. 4a55c9697e095bca4ae6e94672ec1b8b8bb6af26

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  4a55c9697e095bca4ae6e94672ec1b8b8bb6af26 (commit)
      from  eac6bd72843cc724df6e90660fe0f1c1660894ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4a55c9697e095bca4ae6e94672ec1b8b8bb6af26
Author: Ivan1986 <iva...@li...>
Date:   Mon Oct 4 14:51:30 2010 +0400

    Исправлена ошибка в скафолдинге - передавался не ключ в display

diff --git a/lib/Modules/Scaffold/scaffold/index.html b/lib/Modules/Scaffold/scaffold/index.html
index ec3650f..4a7135e 100644
--- a/lib/Modules/Scaffold/scaffold/index.html
+++ b/lib/Modules/Scaffold/scaffold/index.html
@@ -37,9 +37,9 @@
 		?>
 		<td><?php //отображение обычного не связанного поля
 			if (isset($methods['display_'.ucfirst($key)]))
-				echo call_user_func($class.'::display_'.ucfirst($key), $id, $v);
+				echo call_user_func($class.'::display_'.ucfirst($key), $row[$primaryKey], $v);
 			else
-				echo $i->display($id, $v);
+				echo $i->display($row[$primaryKey], $v);
 		?></td>
 	<?php } ?>
 	<td><a href="<?php echo Url::C('edit/'.$row[$primaryKey]) ?>">ред.</a></td>

-----------------------------------------------------------------------

Summary of changes:
 lib/Modules/Scaffold/scaffold/index.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
quickfw