Author: tmortagne Date: 2008-02-27 12:30:07 +0100 (Wed, 27 Feb 2008) New Revision: 7994
Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations Log: XAWM-52: Display an error in a page when plugin it depends on can't be loaded Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191861931000</creationDate> -<date>1200762043000</date> -<contentUpdateDate>1200762043000</contentUpdateDate> -<version>4.1</version> +<date>1204111112000</date> +<contentUpdateDate>1204111112000</contentUpdateDate> +<version>5.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -102,6 +102,9 @@ #includeMacros("WikiCode.Macros") ## #set($WikiManager = $xwiki.wikimanager) + #if(!$WikiManager) + #error($msg.get("wikimanager.pluginnotenabled")) + #end #set($Exception = $WikiManager.DefaultException) ## ############################################################################# Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191514175000</creationDate> -<date>1200765508000</date> -<contentUpdateDate>1200765508000</contentUpdateDate> -<version>44.1</version> +<date>1204111018000</date> +<contentUpdateDate>1204111018000</contentUpdateDate> +<version>45.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -55,6 +55,9 @@ </property> </object> <content>#set($WikiManager = $xwiki.wikimanager) +#if(!$WikiManager) + #error($msg.get("wikimanager.pluginnotenabled")) +#end #set($Globalsearch = $WikiManager.searchApi) ## #includeMacros("WikiCode.Macros") Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191861990000</creationDate> -<date>1200762080000</date> -<contentUpdateDate>1200762080000</contentUpdateDate> -<version>6.1</version> +<date>1204111097000</date> +<contentUpdateDate>1204111097000</contentUpdateDate> +<version>7.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -102,6 +102,9 @@ #includeMacros("WikiCode.Macros") ## #set($WikiManager = $xwiki.wikimanager) + #if(!$WikiManager) + #error($msg.get("wikimanager.pluginnotenabled")) + #end #set($Exception = $WikiManager.DefaultException) ## ############################################################################# Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191862009000</creationDate> -<date>1200762062000</date> -<contentUpdateDate>1200762062000</contentUpdateDate> -<version>4.1</version> +<date>1204111061000</date> +<contentUpdateDate>1204111061000</contentUpdateDate> +<version>5.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -102,6 +102,9 @@ #includeMacros("WikiCode.Macros") ## #set($WikiManager = $xwiki.wikimanager) + #if(!$WikiManager) + #error($msg.get("wikimanager.pluginnotenabled")) + #end #set($Exception = $WikiManager.DefaultException) ## ############################################################################# Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191861970000</creationDate> -<date>1200762099000</date> -<contentUpdateDate>1200762099000</contentUpdateDate> -<version>6.1</version> +<date>1204111081000</date> +<contentUpdateDate>1204111081000</contentUpdateDate> +<version>7.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -102,6 +102,9 @@ #includeMacros("WikiCode.Macros") ## #set($WikiManager = $xwiki.wikimanager) + #if(!$WikiManager) + #error($msg.get("wikimanager.pluginnotenabled")) + #end #set($Exception = $WikiManager.DefaultException) ## ############################################################################# Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1186676964000</creationDate> -<date>1201519586000</date> -<contentUpdateDate>1201519586000</contentUpdateDate> -<version>7.1</version> +<date>1204110214000</date> +<contentUpdateDate>1204110214000</contentUpdateDate> +<version>9.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -54,7 +54,14 @@ <tags/> </property> </object> -<content>############################################################################################ +<content>#set($WikiManager = $xwiki.wikimanager) +#if(!$WikiManager) + #error($msg.get("wikimanager.pluginnotenabled")) +#end +#if(!$xwiki.applicationmanager) + #error($msg.get("xapp.pluginnotenabled")) +#end +############################################################################################ #macro(getRequestList $paramlist $paramname) #set($paramtable = []) #set($paramtable = $request.getParameterValues($paramname)) @@ -112,12 +119,11 @@ #end #end ############################################################################################ -#set($wikimanager = $xwiki.wikimanager) -#set($Exception = $wikimanager.DefaultException) +#set($Exception = $WikiManager.DefaultException) ## #set($domainname = "localdomain.com") ## -#set($wikidocument = $wikimanager.createWikiDocument()) +#set($wikidocument = $WikiManager.createWikiDocument()) #set($wikidocumentobject = $wikidocument.updateObjectFromRequest("XWiki.XWikiServerClass")) ## #set($action = $request.getParameter("action")) @@ -144,7 +150,7 @@ 1 $msg.get("wikimanager.createwiki") ## #if ($action && $action == "create") - #set($result = $wikimanager.createNewWiki($wikiname, $wikitemplate, $wikipackage, $wikidocument, true)) + #set($result = $WikiManager.createNewWiki($wikiname, $wikitemplate, $wikipackage, $wikidocument, true)) ## #if ($result == $Exception.ERROR_NOERROR) ## Init new wiki global rights @@ -214,7 +220,7 @@ <dd> <select name="wikitemplate" id="wikitemplate"> <option value="">---</option> - #set($listtemplate=$wikimanager.getWikiTemplateList()) + #set($listtemplate=$WikiManager.getWikiTemplateList()) #foreach ($template in $listtemplate) <option value="$template.wikiName">$template.wikiName</option> #end @@ -258,5 +264,5 @@ <legend>$msg.get("wikimanager.legend.validate")</legend> <input type="submit" value="create" /> </fieldset> -</form></content> -</xwikidoc> +</form> +</content></xwikidoc> \ No newline at end of file Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1186676868000</creationDate> -<date>1204106952000</date> -<contentUpdateDate>1204106952000</contentUpdateDate> -<version>19.1</version> +<date>1204109702000</date> +<contentUpdateDate>1204109702000</contentUpdateDate> +<version>23.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -55,6 +55,13 @@ </property> </object> <content>#set($WikiManager = $xwiki.wikimanager) +#if(!$WikiManager) + #error($msg.get("wikimanager.pluginnotenabled")) +#end +#if(!$xwiki.applicationmanager) + #error($msg.get("xapp.pluginnotenabled")) +#end + #set($Exception = $WikiManager.DefaultException) #set($action = $request.getParameter("action")) Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations 2008-02-27 11:28:52 UTC (rev 7993) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations 2008-02-27 11:30:07 UTC (rev 7994) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1186679007000</creationDate> -<date>1201168267000</date> -<contentUpdateDate>1201168267000</contentUpdateDate> -<version>2.1</version> +<date>1204109400000</date> +<contentUpdateDate>1204109400000</contentUpdateDate> +<version>4.1</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -59,6 +59,7 @@ # Wiki Manager translation page ## wikimanager.wikimanager=Wiki Manager +wikimanager.pluginnotenabled=The Wiki Manager plugin is not enabled. This page will not work properly. Make sure "com.xpn.xwiki.plugin.wikimanager.WikiManagerPlugin" is listed in xwiki.plugins parameter in xwiki.cfg file. ## wikimanager.wikinameneeded=A name for the wiki is necessary ## _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications