diff --git a/browser/action.py b/browser/action.py
index c9e86b8..0108cd2 100644
--- a/browser/action.py
+++ b/browser/action.py
@@ -98,14 +98,16 @@ class DialogAction(Action):
actions.register('info', 'object', DialogAction,
description=_(u'Information about this object.'),
viewName='object_info.html',
- dialogName='object_info',
+ #dialogName='object_info',
+ dialogName='',
icon='cybertools.icons/info.png',
cssClass='icon-action',
+ addParams=dict(version='this')
)
actions.register('external_edit', 'object', TargetAction,
description=_(u'Edit with external editor.'),
- viewName='external_edit?version=this',
+ viewName='external_edit',
icon='edit.gif',
cssClass='icon-action',
)
diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index 3c26c3f..11d799e 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -138,7 +138,7 @@
- Type
+ 2 MB
|
2007-03-30 |
John |
diff --git a/browser/info.pt b/browser/info.pt
new file mode 100644
index 0000000..3f473ce
--- /dev/null
+++ b/browser/info.pt
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
diff --git a/browser/loops.js b/browser/loops.js
index 00055df..1e928b5 100644
--- a/browser/loops.js
+++ b/browser/loops.js
@@ -105,14 +105,14 @@ function setConceptTypeForComboBox(typeId, cbId) {
}
var dialog;
-var dialogName
+var dialogName;
function objectDialog(dlgName, url) {
dojo.require('dijit.Dialog');
dojo.require('dojo.parser');
dojo.require('dijit.form.FilteringSelect');
dojo.require('dojox.data.QueryReadStore');
- if (dialogName == undefined || dialogName != dlgName) {
+ if (dialogName == undefined || dialogName != dlgName || dialogName == '') {
if (dialog != undefined) {
dialog.destroyRecursive();
}
diff --git a/browser/node.py b/browser/node.py
index 630cb52..12b22b3 100644
--- a/browser/node.py
+++ b/browser/node.py
@@ -64,6 +64,7 @@ from loops.versioning.util import getVersion
node_macros = ViewPageTemplateFile('node_macros.pt')
+info_macros = ViewPageTemplateFile('info.pt')
class NodeView(BaseView):
@@ -375,25 +376,6 @@ class NodeView(BaseView):
if target is not None:
return BaseView(target, self.request).url
- # states information
-
- @Lazy
- def xxx_states(self):
- result = []
- if not checkPermission('loops.ManageSite', self.context):
- # TODO: replace by more sensible permission
- return result
- target = self.virtualTargetObject
- #statesDefs = ['loops.classification_quality', 'loops.simple_publishing']
- if IResource.providedBy(target):
- statesDefs = self.globalOptions('organize.stateful.resource', ())
- else:
- statesDefs = ()
- for std in statesDefs:
- stf = component.getAdapter(target, IStateful, name=std)
- result.append(stf)
- return result
-
# target viewing and editing support
def getUrlForTarget(self, target):
@@ -489,7 +471,7 @@ class ObjectInfo(NodeView):
@property
def macro(self):
- return self.template.macros['object_info']
+ return info_macros.macros['object_info']
@Lazy
def dialog_name(self):
diff --git a/browser/node_macros.pt b/browser/node_macros.pt
index 3cc807a..bc706d2 100644
--- a/browser/node_macros.pt
+++ b/browser/node_macros.pt
@@ -218,11 +218,6 @@
-
- Object Information
-
-
-