26 Jan
2010
26 Jan
'10
5:01 p.m.
On 01/26/2010 03:14 PM, jvelociter (SVN) wrote:
Author: jvelociter
Date: 2010-01-26 15:14:24 +0100 (Tue, 26 Jan 2010)
New Revision: 26407
Modified:
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties
platform/web/trunk/standard/src/main/webapp/templates/imported.vm
Log:
XWIKI-4796 When importing XE XAR from an empty database, the import result is not
properly displayed
Modified:
platform/web/trunk/standard/src/main/webapp/templates/imported.vm
===================================================================
+#else
+ ## If the current user does not have admin and this template is being displayed
+ ## it means security settings have been changed with the import (probably a defaut XE
XAR import)
+ ## We display a warning and invite the user to log in to further administrate the wiki
What if the user was logged in, but now has fewer rights?
Minor: you don't need the "" around the message, since it's a single
string result which can be passed to the macro.
+
#warning("$msg.get('core.importer.securitySettingsChanged',
[$xwiki.getURL('XWiki.XWikiLogin', 'login')])")
+#end
\ No newline at end of file
--
Sergiu Dumitriu
http://purl.org/net/sergiu/