some more ui improvements
updated the wg fixed some more cs mail bugs
This commit is contained in:
parent
6dba08b727
commit
9ef6621cc3
5 changed files with 32 additions and 81 deletions
|
|
@ -305,6 +305,10 @@ sub definition {
|
||||||
fieldType=>"email",
|
fieldType=>"email",
|
||||||
defaultValue=>undef
|
defaultValue=>undef
|
||||||
},
|
},
|
||||||
|
mailPrefix=>{
|
||||||
|
fieldType=>"text",
|
||||||
|
defaultValue=>undef
|
||||||
|
},
|
||||||
getMailCronId=>{
|
getMailCronId=>{
|
||||||
fieldType=>"hidden",
|
fieldType=>"hidden",
|
||||||
defaultValue=>undef,
|
defaultValue=>undef,
|
||||||
|
|
@ -513,6 +517,12 @@ sub getEditForm {
|
||||||
label=>$i18n->get("get mail interval"),
|
label=>$i18n->get("get mail interval"),
|
||||||
hoverHelp=>$i18n->get("get mail interval help"),
|
hoverHelp=>$i18n->get("get mail interval help"),
|
||||||
);
|
);
|
||||||
|
$tabform->getTab("mail")->text(
|
||||||
|
name=>"mailPrefix",
|
||||||
|
value=>$self->getValue("mailPrefix"),
|
||||||
|
label=>$i18n->get("mail prefix"),
|
||||||
|
hoverHelp=>$i18n->get("mail prefix help"),
|
||||||
|
);
|
||||||
$tabform->getTab("display")->interval(
|
$tabform->getTab("display")->interval(
|
||||||
-name=>"visitorCacheTimeout",
|
-name=>"visitorCacheTimeout",
|
||||||
-label=>$i18n->get('visitor cache timeout'),
|
-label=>$i18n->get('visitor cache timeout'),
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -64,7 +64,8 @@ sub create {
|
||||||
my $properties = shift;
|
my $properties = shift;
|
||||||
my $id = shift;
|
my $id = shift;
|
||||||
my ($isSerial) = $session->db->quickArray("select isSerial from Workflow where workflowId=?",[$properties->{workflowId}]);
|
my ($isSerial) = $session->db->quickArray("select isSerial from Workflow where workflowId=?",[$properties->{workflowId}]);
|
||||||
my ($count) = $session->db->quickArray("select count(*) from WorkflowInstance where workflowId=?",[$properties->{workflowId}]);
|
my $params = (exists $properties->{parameters}) ? JSON::objToJson({parameters => $properties->{parameters}}) : undef;
|
||||||
|
my ($count) = $session->db->quickArray("select count(*) from WorkflowInstance where workflowId=? and parameters=?",[$properties->{workflowId},$params]);
|
||||||
return undef if ($isSerial && $count);
|
return undef if ($isSerial && $count);
|
||||||
my $instanceId = $session->db->setRow("WorkflowInstance","instanceId",{instanceId=>"new", runningSince=>time()}, $id);
|
my $instanceId = $session->db->setRow("WorkflowInstance","instanceId",{instanceId=>"new", runningSince=>time()}, $id);
|
||||||
my $self = $class->new($session, $instanceId);
|
my $self = $class->new($session, $instanceId);
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,18 @@ package WebGUI::i18n::English::Asset_Collaboration;
|
||||||
|
|
||||||
our $I18N = {
|
our $I18N = {
|
||||||
|
|
||||||
|
'mail prefix' => {
|
||||||
|
message => q|Prefix|,
|
||||||
|
lastUpdated => 0,
|
||||||
|
context => q|field label for mail setting|
|
||||||
|
},
|
||||||
|
|
||||||
|
'mail prefix help' => {
|
||||||
|
message => q|This string will be prepended to the subject line of all emails sent out from this collaboration system.|,
|
||||||
|
lastUpdated => 0,
|
||||||
|
context => q|help for mail setting field label|
|
||||||
|
},
|
||||||
|
|
||||||
'get mail interval' => {
|
'get mail interval' => {
|
||||||
message => q|Check Mail Every|,
|
message => q|Check Mail Every|,
|
||||||
lastUpdated => 0,
|
lastUpdated => 0,
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,7 @@ th {
|
||||||
|
|
||||||
.adminConsoleMainMenu:hover, .adminConsoleUtilityMenu:hover {
|
.adminConsoleMainMenu:hover, .adminConsoleUtilityMenu:hover {
|
||||||
opacity: 1.0;
|
opacity: 1.0;
|
||||||
|
background-color: #fafafa;
|
||||||
}
|
}
|
||||||
|
|
||||||
.adminConsoleMainMenu {
|
.adminConsoleMainMenu {
|
||||||
|
|
@ -81,8 +82,8 @@ th {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
-moz-border-radius: 5px;
|
-moz-border-radius: 5px;
|
||||||
background-color: #fafafa;
|
background-color: #bbbbbb;
|
||||||
opacity: 0.6;
|
opacity: 0.7;
|
||||||
}
|
}
|
||||||
|
|
||||||
.adminConsoleSubmenu {
|
.adminConsoleSubmenu {
|
||||||
|
|
@ -99,7 +100,7 @@ th {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
-moz-border-radius: 5px;
|
-moz-border-radius: 5px;
|
||||||
background-color: #fafafa;
|
background-color: #bbbbbb;
|
||||||
}
|
}
|
||||||
|
|
||||||
.adminConsoleHidden {
|
.adminConsoleHidden {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue