# HG changeset patch
# User juanjose.montesdeocaarbos
# Date 1318390327 10800
# Node ID 0d65ebf63aedc65589946124fb7f624795c53399
# Parent  9e1e2435388efba97e8ea0cdf8f5e3c6a95dbdd0# Parent  7cf64cd790abf36dfbed442cbd77f22775d297c8
Combinar

diff -r 9e1e2435388e -r 0d65ebf63aed Agendas/trunk/src/Agendas.Repositories.NHibernate/EventoRepository.cs
--- a/Agendas/trunk/src/Agendas.Repositories.NHibernate/EventoRepository.cs	Fri Oct 07 22:50:45 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Repositories.NHibernate/EventoRepository.cs	Wed Oct 12 00:32:07 2011 -0300
@@ -19,11 +19,6 @@
 			Session.Delete(evento);
 		}
 
-		public new Evento Get(Guid vanId)
-		{
-			return Session.Get<Evento>(vanId);
-		}
-
 		public IList<Evento> GetActivos()
 		{
 			return
diff -r 9e1e2435388e -r 0d65ebf63aed Agendas/trunk/src/Agendas.Repositories.NHibernate/RepositoryBase.cs
--- a/Agendas/trunk/src/Agendas.Repositories.NHibernate/RepositoryBase.cs	Fri Oct 07 22:50:45 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Repositories.NHibernate/RepositoryBase.cs	Wed Oct 12 00:32:07 2011 -0300
@@ -8,7 +8,7 @@
 	{
 		private readonly ISessionFactory _sessionFactory;
 
-		public RepositoryBase(ISessionFactory sessionFactory)
+		protected RepositoryBase(ISessionFactory sessionFactory)
 		{
 			_sessionFactory = sessionFactory;
 		}
@@ -22,7 +22,8 @@
 
         public T Get(Guid id)
         {
-            return Session.QueryOver<T>().Where(i => i.Id == id).SingleOrDefault();
+			return Session.Get<T>(id);
+			//return Session.QueryOver<T>().Where(i => i.Id == id).SingleOrDefault();
         }
 
 	}
diff -r 9e1e2435388e -r 0d65ebf63aed Agendas/trunk/src/Agendas.Web/Content/Site.css
--- a/Agendas/trunk/src/Agendas.Web/Content/Site.css	Fri Oct 07 22:50:45 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Content/Site.css	Wed Oct 12 00:32:07 2011 -0300
@@ -132,6 +132,11 @@
 	background: transparent url("themes/altnethispano/images/ul_topsponsors_li.gif") repeat-x 0 0;
 	text-align: center;
 }
+
+#version {
+	float: right;
+}
+
 .userGroupLogo 
 {
 	padding: 0 10px;
diff -r 9e1e2435388e -r 0d65ebf63aed Agendas/trunk/src/Agendas.Web/DataProviders.cs
--- a/Agendas/trunk/src/Agendas.Web/DataProviders.cs	Fri Oct 07 22:50:45 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/DataProviders.cs	Wed Oct 12 00:32:07 2011 -0300
@@ -41,5 +41,10 @@
 		{
 			return new[] {Roles.Administrador, Roles.Usuario};
 		}
+
+		public static string Version(this HtmlHelper helper)
+		{
+			return typeof (DataProviders).Assembly.GetName().Version.ToString();
+		}
 	}
 }
diff -r 9e1e2435388e -r 0d65ebf63aed Agendas/trunk/src/Agendas.Web/Properties/AssemblyInfo.cs
--- a/Agendas/trunk/src/Agendas.Web/Properties/AssemblyInfo.cs	Fri Oct 07 22:50:45 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Properties/AssemblyInfo.cs	Wed Oct 12 00:32:07 2011 -0300
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
diff -r 9e1e2435388e -r 0d65ebf63aed Agendas/trunk/src/Agendas.Web/Views/Shared/EditorTemplates/Ponentes.cshtml
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/EditorTemplates/Ponentes.cshtml	Fri Oct 07 22:50:45 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/EditorTemplates/Ponentes.cshtml	Wed Oct 12 00:32:07 2011 -0300
@@ -1,7 +1,7 @@
 @model IEnumerable<Guid>
 <script type="text/javascript">
 	$(document).ready(function () {
-		$("#agregarPonente").subpanel({ success: add_new_otro_ponente, url: '/PersonaApi/Nueva' });
+		$("#agregarPonente").subpanel({ success: add_new_otro_ponente, url: '@Url.Action("Nueva", "PersonaApi")' });
 		$("#add").click(select_otro_ponente);
 		$("#remove").click(remove_otro_ponente);
 
diff -r 9e1e2435388e -r 0d65ebf63aed Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Fri Oct 07 22:50:45 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Wed Oct 12 00:32:07 2011 -0300
@@ -58,6 +58,9 @@
 			        <a target="_blank" title="DiscountASP" href="http://www.discountasp.com/">
 				        <img src="@Url.Content("~/Content/themes/altnethispano/images/logoDiscountASPNET.gif")" title="DiscountASP.NET" alt="DiscountASP.NET" height="25" />
 			        </a>
+					<div id="version">
+						versión: @Html.Version()&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					</div>
                 </div>
             </div>
         </div>