Reenable #link.title and wf:logout

goj · Jun 29, 2010 · 1acc87f · 1acc87f
1 parent 0c22451
commit 1acc87f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apps/nitrogen/include/wf.hrl b/apps/nitrogen/include/wf.hrl
@@ -78,7 +78,7 @@
 -record(p, {?ELEMENT_BASE(element_p), body=""}).
 -record(label, {?ELEMENT_BASE(element_label), text="", html_encode=true}).
 -record(value, {?ELEMENT_BASE(element_value), text="", html_encode=true}).
--record(link, {?ELEMENT_BASE(element_link), title = undefined, text="", body="", html_encode=true, url="javascript:", postback, delegate}).
+-record(link, {?ELEMENT_BASE(element_link), title = "", text="", body="", html_encode=true, url="javascript:", postback, delegate}).
 -record(error, {?ELEMENT_BASE(element_error), text="", html_encode=true}).
 -record(span, {?ELEMENT_BASE(element_span), text="", html_encode=true}).
 -record(button, {?ELEMENT_BASE(element_button), text="Button", html_encode=true, postback, delegate}).

diff --git a/apps/nitrogen/src/wf.erl b/apps/nitrogen/src/wf.erl
@@ -121,7 +121,8 @@ set(Element, Value) ->
 
 %%% OTHER %%%
 % TODO
-% logout() -> clear_user(), clear_roles(), clear_state(), clear_session().
+logout() -> clear_user(), clear_roles(), clear_state(), clear_session().
+
 to_js_id(Path) -> 
     _String = wf_render_actions:to_js_id(Path).