oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Commit from the Admin Bar. Only seen when there's no autocommit, and comments

Browse source 
are disabled.  Added a button/form to the subpanel with CSRF.
This commit is contained in:
Colin Kuskie 2009-07-27 20:24:22 +00:00
parent 31544f13b0
commit dd9b46272b
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -7,6 +7,7 @@
- fixed #10698: hard coded root paths in account templates - fixed #10698: hard coded root paths in account templates
- fixed #10700: Default My Sales template needs i18n - fixed #10700: Default My Sales template needs i18n
- fixed #10702: Product displays empty brochure, warranty, manual fields - fixed #10702: Product displays empty brochure, warranty, manual fields
- fixed #10704: Commit version tag from AdminBar is not working
7.7.16 7.7.16
- fixed #10590: Session::DateTime->secondsToInterval doesn't allow 7 weeks - fixed #10590: Session::DateTime->secondsToInterval doesn't allow 7 weeks

6
lib/WebGUI/Macro/AdminBar.pm
View file

@ -70,9 +70,9 @@ sub process {
else { else {
$commitUrl = $url->page("op=commitVersionTag;tagId=".$workingId); $commitUrl = $url->page("op=commitVersionTag;tagId=".$workingId);
} }
$out .= q{<a class="link" href="}.$commitUrl.q{">} $out .= WebGUI::Form::formHeader($session, { action => $commitUrl, })
.q{<img src="}.$url->extras('adminConsole/small/versionTags.gif').q{" style="border: 0px; vertical-align: middle;" alt="icon" /> } . q{<button type="submit" class="wgButton">}.q{<span><img src="}.$url->extras('adminConsole/small/versionTags.gif').q{" style="border: 0px; vertical-align: middle;" alt="icon" /> }.$i18n->get("commit my changes").q{</span></button>}
.$i18n->get("commit my changes").q{</a>}; . WebGUI::Form::formFooter($session);
} }
foreach my $tag (@{$versionTags}) { foreach my $tag (@{$versionTags}) {
next unless $user->isInGroup($tag->get("groupToUse")); next unless $user->isInGroup($tag->get("groupToUse"));

17
www/extras/macro/AdminBar/slidePanel.css
View file

@ -71,7 +71,8 @@ dl.accordion-menu dd.a-m-d {
font-weight: normal; font-weight: normal;
} }
dl.accordion-menu dd.a-m-d .link { dl.accordion-menu dd.a-m-d .link,
dl.accordion-menu dd.a-m-d .wgButton {
margin: 0; margin: 0;
padding: 0; padding: 0;
display: block; display: block;
@ -92,12 +93,22 @@ dl.accordion-menu dd.a-m-d .link {
line-height:12px; line-height:12px;
} }
dl.accordion-menu dd.a-m-d .wgButton {
background-color: transparent;
border: none;
display: inline;
margin-left: 0px;
padding-left: 0px;
width: auto;
-moz-user-select: text;
}
dl.accordion-menu dd.a-m-d .link img { dl.accordion-menu dd.a-m-d .link img {
margin-left:-20px; margin-left:-20px;
} }
dl.accordion-menu dd.a-m-d .link:hover { dl.accordion-menu dd.a-m-d .link:hover,
dl.accordion-menu dd.a-m-d button.wgButton:hover span {
color: blue; color: blue;
background-color: #F5F5F5; background-color: #F5F5F5;
} }