diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index c72149c0a..01101119b 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -10,7 +10,8 @@ Andreas Graf). - Bugfix [ 904313 ] Problem with page-template preview in 6.0.0 - Bugfix [ 912017 ] viewSubmission function error in 6.0.0 - Bugfix [ 912217 ] top level nav macro problems - + - Bugfix [ 912401 ] level 0 nav + - Bugfix [ 912400 ] db link not working 6.0.0 diff --git a/docs/upgrades/upgrade_6.0.0-6.0.1.sql b/docs/upgrades/upgrade_6.0.0-6.0.1.sql index 2183342c3..02d44fb10 100644 --- a/docs/upgrades/upgrade_6.0.0-6.0.1.sql +++ b/docs/upgrades/upgrade_6.0.0-6.0.1.sql @@ -79,4 +79,5 @@ INSERT INTO international VALUES (1095,'WebGUI',1,'

The general idea behind th INSERT INTO international VALUES (1096,'WebGUI',1,'Navigation Template',1078207966,NULL); INSERT INTO international VALUES (1097,'WebGUI',1,'config.button 
A \"Edit / Manage\" button for this navigation item.
\r\n

page_loop
A loop containing page information.

\r\n
\r\n

page.menuTitle
The menu title of this page.

\r\n

page.title
The title of this page.

\r\n

page.urlizedTitle
The urlized title of this pagepage.url.

\r\n

page.url
The url of this page.

\r\n

page.pageId
The pageId of this page.

\r\n

page.parentId
The ParentId of this page.

\r\n

page.ownerId
The ownerId of this page.

\r\n

page.synopsis
The synopsis of this page.

\r\n

page.newWindow
A condition indicating whether this page should be opened in a new window.

\r\n

page.absDepth
The absolute depth of this page (relative to nameless root).

\r\n

page.relDepth
The relative depth of this page (relative to starting point).

\r\n

page.isCurrent
A condition indicating whether this page is current page.

\r\n

page.isHidden
A condition indicating whether this page is a hidden page.
(Note: This variable is only visible if \"Show hidden pages\" is switched on.)

\r\n

page.isSystem
A condition indicating whether this page is a system page (Trash, Clipboard, etc).
(Note: This variable is only visible if \"Show system pages\" is switched on.)

\r\n

page.isViewable
A condition indicating whether the user has permission to view it.
(Note: This variable is only visible if \"Show unprivileged pages\" is switched on.)

\r\n

page.indent
A variable containing the indent for current page. The default indent is three spaces. Use the page.indent_loop if you need a more flexible indent.

\r\n

page.indent_loop
A loop that runs page.relDepth times.

\r\n
\r\n

indent
A number representing the loop count.

\r\n

page.isRoot
A condition indication whether this page is a root page.

\r\n

page.isTop
A condition indication whether this page is a top page (daughter of root).

\r\n

page.hasDaughter
A condition indication whether this page has a daughter. In other words: It evaluates to true if this page is a mother.

\r\n

page.isMyDaughter
A condition indication whether this page is a daughter of current page.

\r\n

page.isMyMother
A condition indication whether this page is the mother of current page.

\r\n

page.mother.title
The title of the mother of this page.

\r\n

page.mother.urlizedTitle
The urlized title of the mother of this page.

\r\n

page.mother.pageId
The pageId of the mother of this page.

\r\n

page.mother.parentId
The parentId of the mother of this page.

\r\n

page.depthIs1 , page.depthIs2 , page.depthIs3 , page.depthIs4 , page.depthIsN
A condition indicating whether the depth of this page is N. This variable is useful if you want to style a certain level.

\r\n

<tmpl_if page.depthIs1>
   <img src=\"level1.gif\">
<tmpl_else>
   <img src=\"defaultBullet.gif\">
</tmpl_if>

\r\n

page.relativeDepthIs1 , page.relativeDepthIs2 , page.relativeDepthIs3 , page.relativeDepthIsN
A condition indicating whether the relative depth of this page is N.

\r\n

 

',1078207966,NULL); update Navigation set depth=99 where depth=0; +delete from international where internationalId=981 and namespace='WebGUI'; diff --git a/lib/WebGUI/DatabaseLink.pm b/lib/WebGUI/DatabaseLink.pm index cbf6409fc..07cb75b02 100644 --- a/lib/WebGUI/DatabaseLink.pm +++ b/lib/WebGUI/DatabaseLink.pm @@ -154,7 +154,7 @@ sub dbh { $dsn = $class->{_databaseLink}{DSN}; $username = $class->{_databaseLink}{username}; $identifier = $class->{_databaseLink}{identifier}; - if ($class->{databaseLinkId} == 0) { + if ($class->{_databaseLinkId} == 0) { $class->{_dbh} = $session{dbh}; return $session{dbh}; } elsif ($dsn =~ /\DBI\:\w+\:\w+/i) { diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm index 477539acc..f1dd9527d 100644 --- a/lib/WebGUI/Form.pm +++ b/lib/WebGUI/Form.pm @@ -343,7 +343,7 @@ The unique identifier for the selected template. Defaults to "0", which is the W =cut sub databaseLink { - my $value = $_[0]->{value} || 1; + my $value = $_[0]->{value} || 0; my $name = $_[0]->{name} || "databaseLinkId"; return selectList({ name=>$name, diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm index 8bd1feac6..4b27e76a4 100644 --- a/lib/WebGUI/HTMLForm.pm +++ b/lib/WebGUI/HTMLForm.pm @@ -536,14 +536,10 @@ sub databaseLink { if (_uiLevelChecksOut($uiLevel)) { $label = $label || WebGUI::International::get(1075); if (WebGUI::Privilege::isInGroup(3)) { - #disabled until we can resolve the "new" wobject problem - #if ($afterEdit) { - # $subtext = ''.WebGUI::International::get(0).' / '; - #} - $subtext .= '' - .WebGUI::International::get(981).''; + if ($afterEdit) { + $subtext = editIcon("op=editDatabaseLink&lid=".$value."&afterEdit=".WebGUI::URL::escape($afterEdit)); + } + $subtext .= manageIcon("op=listDatabaseLinks"); } $output = WebGUI::Form::databaseLink({ "name"=>$name,