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

do not show an edit link in the Asset Manager unless the asset is editable

Browse source
This commit is contained in:
Colin Kuskie 2008-11-15 03:38:09 +00:00
parent 4e1df1ba0e
commit 38add7ccbe
3 changed files with 12 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

@ -10,6 +10,7 @@
from Add/Edit Field dialogs (SDH Consulting Group). from Add/Edit Field dialogs (SDH Consulting Group).
- fixed #4214: Missing i18n in asset manager - fixed #4214: Missing i18n in asset manager
- fixed #8849: More missing i18n - fixed #8849: More missing i18n
- fixed #4182: Edit links show in asset manager for locked assets
7.6.3 7.6.3
- improved performance of file uploads - improved performance of file uploads

2
lib/WebGUI/Content/AssetManager.pm
View file

@ -288,7 +288,7 @@ sub www_ajaxGetManagerPage {
childCount => $asset->getChildCount, childCount => $asset->getChildCount,
assetSize => $asset->get( 'assetSize' ), assetSize => $asset->get( 'assetSize' ),
lockedBy => $asset->get( 'isLockedBy' ), lockedBy => $asset->get( 'isLockedBy' ),
canEditIfLocked => $asset->canEditIfLocked, actions => $asset->canEdit && $asset->canEditIfLocked,
); );
$fields{ className } = {}; $fields{ className } = {};

16
www/extras/yui-webgui/build/assetManager/assetManager.js vendored
View file

@ -61,10 +61,16 @@ WebGUI.AssetManager.findRow
Format the Edit and More links for the row Format the Edit and More links for the row
*/ */
WebGUI.AssetManager.formatActions = function ( elCell, oRecord, oColumn, orderNumber ) { WebGUI.AssetManager.formatActions = function ( elCell, oRecord, oColumn, orderNumber ) {
elCell.innerHTML if ( oRecord.getData( 'actions' ) ) {
= '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=edit;proceed=manageAssets') + '">' + WebGUI.AssetManager.i18n.get('Asset', 'edit') + '</a>' elCell.innerHTML
+ ' | ' = '<a href="' + WebGUI.AssetManager.appendToUrl(oRecord.getData( 'url' ), 'func=edit;proceed=manageAssets') + '">'
; + WebGUI.AssetManager.i18n.get('Asset', 'edit') + '</a>'
+ ' | '
;
}
else {
elCell.innerHTML = "";
}
var more = document.createElement( 'a' ); var more = document.createElement( 'a' );
elCell.appendChild( more ); elCell.appendChild( more );
more.appendChild( document.createTextNode( WebGUI.AssetManager.i18n.get('Asset','More' ) ) ); more.appendChild( document.createTextNode( WebGUI.AssetManager.i18n.get('Asset','More' ) ) );
@ -239,8 +245,6 @@ WebGUI.AssetManager.initDataTable = function (o) {
rowsPerPage : 100, rowsPerPage : 100,
previousPageLinkLabel : WebGUI.AssetManager.i18n.get('WebGUI', '< prev'), previousPageLinkLabel : WebGUI.AssetManager.i18n.get('WebGUI', '< prev'),
nextPageLinkLabel : WebGUI.AssetManager.i18n.get('WebGUI', 'next >'), nextPageLinkLabel : WebGUI.AssetManager.i18n.get('WebGUI', 'next >'),
// previousPageLinkLabel : 'fred',
// nextPageLinkLabel : 'barney',
template : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink}" template : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink}"
}); });