[xwiki-notifications] r7995 - in xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources: Main XemManager

[SVN]

Author: tmortagne
Date: 2008-02-27 12:30:47 +0100 (Wed, 27 Feb 2008)
New Revision: 7995

Modified:
   
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
   
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
Log:
XEM-89: Display an error in a page when plugin it depends on can't be loaded

Modified: 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
===================================================================
--- 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
       2008-02-27 11:30:07 UTC (rev 7994)
+++ 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
       2008-02-27 11:30:47 UTC (rev 7995)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1166007764000</creationDate>
-<date>1200761403000</date>
-<contentUpdateDate>1200761403000</contentUpdateDate>
-<version>9.1</version>
+<date>1204110875000</date>
+<contentUpdateDate>1204110875000</contentUpdateDate>
+<version>12.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>

Modified: 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
===================================================================
--- 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
 2008-02-27 11:30:07 UTC (rev 7994)
+++ 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
 2008-02-27 11:30:47 UTC (rev 7995)
@@ -12,14 +12,14 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1187017247000</creationDate>
-<date>1202304765000</date>
-<contentUpdateDate>1202304765000</contentUpdateDate>
-<version>7.1</version>
+<date>1204110536000</date>
+<contentUpdateDate>1204110536000</contentUpdateDate>
+<version>8.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>Deletion of attachment template-xe.xar</comment>
+<comment></comment>
 <minorEdit>false</minorEdit>
 <object>
 <class>
@@ -54,37 +54,44 @@
 <tags/>
 </property>
 </object>
-<content>#set($WikiManager = $xwiki.wikimanager)
-#set($Exception = $WikiManager.DefaultException)
-
-#set($confirm = $request.getParameter("confirm"))
-
-###############################################
-
-#set($templateList = $WikiManager.getWikiTemplateList())
-
-#if($templateList.size() == 0)
-  #if($confirm &amp;&amp; $confirm == 1)
-    #set($result = $WikiManager.createWikiTemplate("templatexe", "XWiki 
Entreprise (default xwiki)", "template-xe.xar"))
-    #if ($result == $Exception.ERROR_NOERROR)
-      #info($msg.get("xem.install.success"))
-    #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
-      #error($msg.get("notallowed"))
-    #else
-      #error($msg.get("xem.install.error", [$context.lastexception]))
-    #end
-  #else
-    #set($urlyes = $doc.getURL("view", "confirm=1"))
-    #set($urlno = $doc.getURL("view"))
-
-    #xwikimessageboxstart($msg.get("xem.answer.install.title") 
$msg.get("xem.answer.install.actions"))
-      $msg.get("xem.answer.install.actions.template")
-      &lt;div class="buttons"&gt;
-        &lt;a href="$urlyes"&gt;&lt;input type="button" class="button" 
value="$msg.get("yes")" onclick="location='$urlyes'; return 
false;"/&gt;&lt;/a&gt;&lt;a href="$urlno"&gt;&lt;input type="button" 
class="button" value="$msg.get("no")" onclick="location='$urlno'; return 
false;"/&gt;&lt;/a&gt;
-      &lt;/div&gt;
-    #xwikimessageboxend()
-  #end
-#else
-  #info($msg.get("xem.install.noneed"))
+<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($confirm = $request.getParameter("confirm"))
+
+###############################################
+
+#set($templateList = $WikiManager.getWikiTemplateList())
+
+#if($templateList.size() == 0)
+  #if($confirm &amp;&amp; $confirm == 1)
+    #set($result = $WikiManager.createWikiTemplate("templatexe", "XWiki 
Entreprise (default xwiki)", "template-xe.xar"))
+    #if ($result == $Exception.ERROR_NOERROR)
+      #info($msg.get("xem.install.success"))
+    #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
+      #error($msg.get("notallowed"))
+    #else
+      #error($msg.get("xem.install.error", [$context.lastexception]))
+    #end
+  #else
+    #set($urlyes = $doc.getURL("view", "confirm=1"))
+    #set($urlno = $doc.getURL("view"))
+
+    #xwikimessageboxstart($msg.get("xem.answer.install.title") 
$msg.get("xem.answer.install.actions"))
+      $msg.get("xem.answer.install.actions.template")
+      &lt;div class="buttons"&gt;
+        &lt;a href="$urlyes"&gt;&lt;input type="button" class="button" 
value="$msg.get("yes")" onclick="location='$urlyes'; return 
false;"/&gt;&lt;/a&gt;&lt;a href="$urlno"&gt;&lt;input type="button" 
class="button" value="$msg.get("no")" onclick="location='$urlno'; return 
false;"/&gt;&lt;/a&gt;
+      &lt;/div&gt;
+    #xwikimessageboxend()
+  #end
+#else
+  #info($msg.get("xem.install.noneed"))
 #end</content>
 </xwikidoc>

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications