<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[591] trunk/rails: Added require statements for blacklight depedencies,
returning nil if user.nil? in new bookmarks form helper</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>591</dd>
<dt>Author</dt> <dd>mwmitchell</dd>
<dt>Date</dt> <dd>2008-06-06 15:39:11 -0400 (Fri, 06 Jun 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added require statements for blacklight depedencies, returning nil if user.nil? in new bookmarks form helper</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkrailsapphelperscatalog_helperrb">trunk/rails/app/helpers/catalog_helper.rb</a></li>
<li><a href="#trunkrailslibuvaz3950rb">trunk/rails/lib/uva/z3950.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkrailsapphelperscatalog_helperrb"></a>
<div class="modfile"><h4>Modified: trunk/rails/app/helpers/catalog_helper.rb (590 => 591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/app/helpers/catalog_helper.rb 2008-06-06 19:20:21 UTC (rev 590)
+++ trunk/rails/app/helpers/catalog_helper.rb 2008-06-06 19:39:11 UTC (rev 591)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def new_user_bookmark_form_view(user,document)
</span><ins>+ return if user.nil?
</ins><span class="cx"> if user.bookmarks.find_by_document_id(document['id'])
</span><span class="cx"> "This is in your #{link_to('Bookmarks', user_bookmarks_path(user))}"
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkrailslibuvaz3950rb"></a>
<div class="modfile"><h4>Modified: trunk/rails/lib/uva/z3950.rb (590 => 591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/lib/uva/z3950.rb 2008-06-06 19:20:21 UTC (rev 590)
+++ trunk/rails/lib/uva/z3950.rb 2008-06-06 19:39:11 UTC (rev 591)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx">
</span><span class="cx"> require 'marc'
</span><span class="cx"> require 'stringio'
</span><ins>+require 'blacklight/z3950'
</ins><span class="cx">
</span><span class="cx"> module UVA::Z3950
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>