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

Added JS-type cancel button to edit view of WebGUI::Asset::Post (Bug #11514)

Browse source
This commit is contained in:
Colin Kuskie 2010-04-05 15:18:19 -07:00
parent 977036f768
commit 9b36e44390
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,7 @@
- fixed #11510: Scratch variables for sort direction and key can break the CS - fixed #11510: Scratch variables for sort direction and key can break the CS
- fixed #11511: Approval Notifications: URL in mails only plain text - fixed #11511: Approval Notifications: URL in mails only plain text
- fixed #11513: white text, broken account mgmt - fixed #11513: white text, broken account mgmt
- fixed #11514: Added JS-type cancel button to edit view of WebGUI::Asset::Post
7.9.1 7.9.1
- fixed #11464: blank page after setting posts per page in Collaboration System to 0 (zero) - fixed #11464: blank page after setting posts per page in Collaboration System to 0 (zero)

BIN
docs/upgrades/packages-7.9.2/root_import_collaboration.wgpkg Normal file
View file

Binary file not shown.

16
lib/WebGUI/Asset/Post.pm
View file

@ -1480,16 +1480,15 @@ Renders a template form for adding and editing posts.
=cut =cut
sub www_edit { sub www_edit {
my $self = shift; my $self = shift;
my $session = $self->session; my $session = $self->session;
my $form = $session->form; my $form = $session->form;
my $privilege = $session->privilege; my $privilege = $session->privilege;
my $user = $session->user; my $user = $session->user;
my $func = $form->process("func"); my $func = $form->process("func");
my (%var, $content, $title, $synopsis); my (%var, $content, $title, $synopsis);
my $i18n = WebGUI::International->new($session); my $i18n = WebGUI::International->new($session);
my $className = $form->process("class","className") || $self->get('className'); my $className = $form->process("class","className") || $self->get('className');
if ($func eq "add" || ($func eq "editSave" && $form->process("assetId") eq "new")) { # new post if ($func eq "add" || ($func eq "editSave" && $form->process("assetId") eq "new")) { # new post
@ -1695,7 +1694,12 @@ sub www_edit {
}); });
} }
$var{'form.submit'} = WebGUI::Form::submit($session, { $var{'form.submit'} = WebGUI::Form::submit($session, {
extras=>"onclick=\"this.value='".$i18n->get(452)."'; this.form.func.value='editSave';return true;\"" extras=>"onclick=\"this.value='".$i18n->get(452)."'; this.form.func.value='editSave';return true;\""
});
$var{'form.cancel'} = WebGUI::Form::button( $session, {
name => "cancel",
value => $i18n->get("cancel"),
extras => 'onclick="history.go(-1)"',
}); });
$var{'karmaScale.form'} = WebGUI::Form::integer($session, { $var{'karmaScale.form'} = WebGUI::Form::integer($session, {
name=>"karmaScale", name=>"karmaScale",
@ -1704,7 +1708,7 @@ sub www_edit {
}); });
$var{karmaIsEnabled} = $session->setting->get("useKarma"); $var{karmaIsEnabled} = $session->setting->get("useKarma");
$var{'form.preview'} = WebGUI::Form::submit($session, { $var{'form.preview'} = WebGUI::Form::submit($session, {
value=>$i18n->get("preview","Asset_Collaboration") value=>$i18n->get("preview","Asset_Collaboration")
}); });
my $numberOfAttachments = $self->getThread->getParent->getValue("attachmentsPerPost"); my $numberOfAttachments = $self->getThread->getParent->getValue("attachmentsPerPost");
$var{'attachment.form'} = WebGUI::Form::image($session, { $var{'attachment.form'} = WebGUI::Form::image($session, {

1
lib/WebGUI/Help/Asset_Post.pm
View file

@ -58,6 +58,7 @@ our $HELP = {
{ 'name' => 'content.form' }, { 'name' => 'content.form' },
{ 'name' => 'skipNotification.form' }, { 'name' => 'skipNotification.form' },
{ 'name' => 'form.submit' }, { 'name' => 'form.submit' },
{ 'name' => 'form.cancel' },
{ 'name' => 'karmaScale.form' }, { 'name' => 'karmaScale.form' },
{ 'name' => 'karmaIsEnabled' }, { 'name' => 'karmaIsEnabled' },
{ 'name' => 'meta_loop', { 'name' => 'meta_loop',

6
lib/WebGUI/i18n/English/Asset_Post.pm
View file

@ -192,7 +192,11 @@ will be a plain text area.|,
message => q|A button to submit the post.|, message => q|A button to submit the post.|,
lastUpdated => 1149829706, lastUpdated => 1149829706,
}, },
'form.cancel' => {
message => q|A button to cancel the post.|,
lastUpdated => 1270240208,
},
'karmaScale.form' => { 'karmaScale.form' => {
message => q|A form element that allows moderators to set the scale of an individual thread. This is only available for threads.|, message => q|A form element that allows moderators to set the scale of an individual thread. This is only available for threads.|,
lastUpdated => 1149829706, lastUpdated => 1149829706,