more bug fixes
This commit is contained in:
parent
8e2f4a5295
commit
c456b708de
5 changed files with 8 additions and 6 deletions
|
|
@ -18,6 +18,9 @@
|
|||
- fix [ 1256549 ] Users are allowed to set url to extras or uploads
|
||||
- fix [ 1262505 ] Unable to edit group info
|
||||
- Added the missing export toolbar icon.
|
||||
- Fixed the context menus that were unclickable.
|
||||
- Fixed a problem with the rich editor in Internet Explorer that caused it
|
||||
not to save new content.
|
||||
- fix [ 1261789 ] fixed(?) can't edit collaboration (Collaboration.pm) (andreasg)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1445,8 +1445,6 @@ sub www_manageAssets {
|
|||
$output .= 'var contextMenu = new contextMenu_createWithLink("'.$child->getId.'","More");
|
||||
contextMenu.addLink("'.$child->getUrl("func=editBranch").'","'.$i18n->get("edit branch").'");
|
||||
contextMenu.addLink("'.$child->getUrl("func=createShortcut&proceed=manageAssets").'","'.$i18n->get("create shortcut").'");
|
||||
contextMenu.addLink("'.$child->getUrl("func=promote").'","'.$i18n->get("promote").'");
|
||||
contextMenu.addLink("'.$child->getUrl("func=demote").'","'.$i18n->get("demote").'");
|
||||
contextMenu.addLink("'.$child->getUrl("func=manageRevisions").'","'.$i18n->get("revisions").'");
|
||||
contextMenu.addLink("'.$child->getUrl.'","'.$i18n->get("view").'"); '."\n";
|
||||
my $title = $child->getTitle;
|
||||
|
|
|
|||
|
|
@ -979,7 +979,7 @@ sub www_search {
|
|||
$self->appendTemplateLabels(\%var);
|
||||
$var{doit} = $session{form}{doit};
|
||||
if ($session{form}{doit}) {
|
||||
my @fieldsToSearch = qw(asset.title asset.synopsis Post.content Post.username Post.userDefined1 Post.userDefined2 Post.userDefined3 Post.userDefined4 Post.userDefined5);
|
||||
my @fieldsToSearch = qw(assetData.title assetData.synopsis Post.content Post.username Post.userDefined1 Post.userDefined2 Post.userDefined3 Post.userDefined4 Post.userDefined5);
|
||||
my $all;
|
||||
if ($session{scratch}{$self->getId."_all"} ne "") {
|
||||
$session{scratch}{$self->getId."_all"} =~ s/,/ /g;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
var ie5=document.all&&document.getElementById
|
||||
var contextMenu_items = new Array();
|
||||
|
||||
var contextMenu_old = (document.onmousedown) ? document.onmousdown : function () {};
|
||||
document.onmousedown= function () {contextMenu_old();contextMenu_hide();};
|
||||
var contextMenu_old = (document.onclick) ? document.onclick : function () {};
|
||||
document.onclick= function () {contextMenu_old();contextMenu_hide();};
|
||||
|
||||
function contextMenu_renderLeftClick(menuId,e) {
|
||||
contextMenu_hide(e);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,8 @@ function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
|
|||
|
||||
function tinyMCE_WebGUI_Cleanup(type,value) {
|
||||
// alert(value);
|
||||
if (value != "[object HTMLBodyElement]") {
|
||||
// return value;
|
||||
if (value != "[object HTMLBodyElement]" && value != "[object]") {
|
||||
value = value.replace(new RegExp(""", "g"),"\"");
|
||||
}
|
||||
return value;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue