- fix: AssetProxied Navigation context menu - items invisible in Style 02
- fix: Request Tracker Asset - Reply to a post displays Severity drop down list - fix: Syndicated wobject erro 6.8+
This commit is contained in:
parent
f63dc89a0b
commit
0aac23dedf
5 changed files with 136 additions and 5 deletions
|
|
@ -1,5 +1,9 @@
|
|||
7.0.1
|
||||
- fix: User profile field "Department" needs i18n
|
||||
- fix: AssetProxied Navigation context menu - items invisible in Style 02
|
||||
- fix: Request Tracker Asset - Reply to a post displays Severity drop down
|
||||
list
|
||||
- fix: Syndicated wobject erro 6.8+
|
||||
- fix: new spectre.pl error (Martin Kamerbeek / Procolix)
|
||||
|
||||
7.0.0
|
||||
|
|
|
|||
117
docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl
Normal file
117
docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
#PBtmpl0000000000000210
|
||||
<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
|
||||
|
||||
<tmpl_if preview.title>
|
||||
<p><b><tmpl_var preview.title></b></p>
|
||||
</tmpl_if>
|
||||
|
||||
<tmpl_if preview.content>
|
||||
<p><tmpl_var preview.content></p>
|
||||
</tmpl_if>
|
||||
|
||||
<h2><tmpl_var message.header.label></h2>
|
||||
|
||||
<tmpl_var form.header>
|
||||
<table class="defaultPostForm">
|
||||
<tmpl_if isNewPost>
|
||||
<tmpl_if user.isVisitor>
|
||||
<tr>
|
||||
<td><tmpl_var visitorName.label></td>
|
||||
<td><tmpl_var visitorName.form></td>
|
||||
</tr>
|
||||
</tmpl_if>
|
||||
</tmpl_if>
|
||||
<tr>
|
||||
<td><tmpl_var subject.label></td>
|
||||
<td><tmpl_var title.form></td>
|
||||
</tr>
|
||||
<tmpl_if isThread>
|
||||
<tr>
|
||||
<td><tmpl_var severity.label></td>
|
||||
<td><select id="myCustomField1" name="userDefined1">
|
||||
<option value="<tmpl_var cosmetic.label>"><tmpl_var cosmetic.label></option>
|
||||
<option value="<tmpl_var minor.label>"><tmpl_var minor.label></option>
|
||||
<option value="<tmpl_var critical.label>"><tmpl_var critical.label></option>
|
||||
<option value="<tmpl_var fatal.label>"><tmpl_var fatal.label></option>
|
||||
</select>
|
||||
<script type="text/javascript">
|
||||
var value = '<tmpl_var name="userDefined1" escape="JS">';
|
||||
var field = document.getElementById("myCustomField1");
|
||||
for (var i = 0; i < field.options.length; i++) {
|
||||
if (field.options[i].value == value) {
|
||||
field.selectedIndex = i;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</td>
|
||||
</tr>
|
||||
</tmpl_if>
|
||||
<tr>
|
||||
<td><tmpl_var description.label></td>
|
||||
<td><tmpl_var content.form></td>
|
||||
</tr>
|
||||
<tmpl_if attachment.form>
|
||||
<tr>
|
||||
<td><tmpl_var attachment.label></td>
|
||||
<td><tmpl_var attachment.form></td>
|
||||
</tr>
|
||||
</tmpl_if>
|
||||
<tmpl_if user.isModerator>
|
||||
<tmpl_if karmaIsEnabled><tmpl_if isThread>
|
||||
<tr>
|
||||
<td><tmpl_var karmaScale.label></td>
|
||||
<td><tmpl_var karmaScale.form></td>
|
||||
</tr>
|
||||
</tmpl_if></tmpl_if>
|
||||
<tmpl_unless isThread>
|
||||
<tr>
|
||||
<td><tmpl_var close.label></td>
|
||||
<td><tmpl_var archive.form></td>
|
||||
</tr>
|
||||
</tmpl_unless>
|
||||
</tmpl_if>
|
||||
<tmpl_if isNewPost>
|
||||
<tmpl_unless user.isVisitor>
|
||||
<tr>
|
||||
<td><tmpl_var subscribe.label></td>
|
||||
<td><tmpl_var subscribe.form></td>
|
||||
</tr>
|
||||
</tmpl_unless>
|
||||
<tmpl_if isNewThread>
|
||||
<tmpl_if user.isModerator>
|
||||
<tr>
|
||||
<td><tmpl_var lock.label></td>
|
||||
<td><tmpl_var lock.form></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><tmpl_var stick.label></td>
|
||||
<td><tmpl_var sticky.form></td>
|
||||
</tr>
|
||||
</tmpl_if>
|
||||
</tmpl_if>
|
||||
</tmpl_if>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
|
||||
</tr>
|
||||
</table>
|
||||
<tmpl_var form.footer>
|
||||
|
||||
<tmpl_if isReply>
|
||||
<p><b><tmpl_var reply.title></b></p>
|
||||
<tmpl_var reply.content>
|
||||
</tmpl_if>
|
||||
~~~
|
||||
<style type="text/css">
|
||||
table.defaultPostForm td
|
||||
{
|
||||
font-family:arial;
|
||||
font-size:9pt;
|
||||
}
|
||||
h2
|
||||
{
|
||||
font-family:arial;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
|
|
@ -965,6 +965,7 @@ sub www_edit {
|
|||
});
|
||||
} elsif ($self->session->form->process("class","className") eq "WebGUI::Asset::Post::Thread") { # new thread
|
||||
return $self->session->privilege->insufficient() unless ($self->getThread->getParent->canPost);
|
||||
$var{isThread} = 1;
|
||||
$var{isNewThread} = 1;
|
||||
if ($self->getThread->getParent->canEdit) {
|
||||
$var{'sticky.form'} = WebGUI::Form::yesNo($self->session, {
|
||||
|
|
|
|||
|
|
@ -274,7 +274,6 @@ sub _normalize_items {
|
|||
sub _get_rss_data {
|
||||
my $session = shift;
|
||||
my $url = shift;
|
||||
|
||||
my $cache = WebGUI::Cache->new($session,'url:' . $url, 'RSS');
|
||||
my $rss_serial = $cache->get;
|
||||
my $rss = {};
|
||||
|
|
@ -473,7 +472,6 @@ sub _get_items {
|
|||
my $self = shift;
|
||||
my $urls = shift;
|
||||
my $maxHeadlines = shift || $self->getValue('maxHeadlines');
|
||||
|
||||
my $displayMode=$self->getValue('displayMode');
|
||||
|
||||
my $hasTermsRegex=_make_regex($self->getValue('hasTerms'));
|
||||
|
|
@ -488,12 +486,18 @@ sub _get_items {
|
|||
|
||||
for my $url (@{$urls}) {
|
||||
my $rss_info=_get_rss_data($self->session,$url);
|
||||
push(@rss_feeds, $rss_info) if($rss_info);
|
||||
push(@rss_feeds, $rss_info) if(defined $rss_info);
|
||||
}
|
||||
|
||||
# deal with the fact that we may never get valid data
|
||||
|
||||
if (scalar(@rss_feeds) < 1) {
|
||||
return ({}, []);
|
||||
}
|
||||
|
||||
#Sort feeds in order by channel title.
|
||||
#@rss_feeds=sort{$a->{channel}->{title} cmp $b->{channel}->{title}} @rss_feeds;
|
||||
|
||||
|
||||
if ($displayMode eq 'grouped') {
|
||||
_create_grouped_items($items,\@rss_feeds,$maxHeadlines,$hasTermsRegex);
|
||||
} else {
|
||||
|
|
@ -578,6 +582,11 @@ sub view {
|
|||
my %var;
|
||||
|
||||
my($item_loop,$rss_feeds)=$self->_get_items(\@validatedUrls, $maxHeadlines);
|
||||
|
||||
if (scalar(@$rss_feeds) < 1) {
|
||||
return $self->processTemplate(\%var,undef,$self->{_viewTemplate});
|
||||
}
|
||||
|
||||
if(@$rss_feeds > 1){
|
||||
#If there is more than one (valid) feed in this wobject, put in the wobject description info.
|
||||
$var{'channel.title'} = $title;
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ function contextMenu_draw(){
|
|||
var output = "";
|
||||
output += '<div id="contextMenu_' + this.id + '_menu" class="contextMenu_skin">';
|
||||
for (i=0;i<this.linkUrls.length;i++) {
|
||||
output += "<a href=\"" + this.linkUrls[i] + "\">" + this.linkLabels[i] + "</a><br />";
|
||||
output += "<a style=\"color: black;\" href=\"" + this.linkUrls[i] + "\">" + this.linkLabels[i] + "</a><br />";
|
||||
}
|
||||
output += '</div>';
|
||||
if (this.type == "image") {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue