Changeset 4630

Timestamp:

Nov 21, 2017, 11:29:11 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #1006: External data filtering and mapping wizard

Re-organized things to get an index page for Relax. The page should only be accessible by administrators.

Added link to the installation wizard and the "Map external data to releases" wizard (no page exists for this one yet).

Location:

extensions/net.sf.basedb.relax/trunk

Files:

• META-INF/extensions.xml (modified) (1 diff)
• resources/admin/install.jsp (modified) (4 diffs)
• resources/images/install.png (added)
• resources/images/wizard.png (added)
• resources/index-admin.js (added)
• resources/index-admin.jsp (added)

extensions/net.sf.basedb.relax/trunk/META-INF/extensions.xml

@@ -69 +69 @@
         <title>Relax (admin)</title>
         <tooltip>Relax administration</tooltip>
-        <data-url>~/admin/install.jsp?ID=$SESSION-ID$</data-url>
+        <data-url>~/index-admin.jsp?ID=$SESSION-ID$</data-url>
         <role>net.sf.basedb.core.Role.ADMINISTRATOR</role>
       </parameters>

extensions/net.sf.basedb.relax/trunk/resources/admin/install.jsp

@@ -4 +4 @@
   import="net.sf.basedb.core.Application"
   import="net.sf.basedb.core.User"
+  import="net.sf.basedb.core.Role"
   import="net.sf.basedb.core.DbControl"
   import="net.sf.basedb.core.SessionControl"
+  import="net.sf.basedb.core.SystemItems"
+  import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
+  import="net.sf.basedb.clients.web.WebException"
   import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
   import="net.sf.basedb.util.Values"
@@ -17 +21 @@
 final String ID = sc.getId();
 final float scale = Base.getScale(sc);
-final String home = ExtensionsControl.getHomeUrl("net.sf.basedb.relax");
+final String home = ExtensionsControl.getHomeUrl("net.sf.basedb.relax.admin");
 DbControl dc = null;
 try
@@ -23 +27 @@
   dc = sc.newDbControl();
   final User user = User.getById(dc, sc.getLoggedInUserId());
+  boolean isAdmin = user.getId() == SystemItems.getId(User.ROOT)
+    || sc.getActiveRoles().contains(SystemItems.getId(Role.ADMINISTRATOR));
+  
+  if (!isAdmin)
+  {
+    throw new PermissionDeniedException("This page requires Administrator privileges.");
+  }
+
 %>
 <base:page type="default" >
@@ -120 +132 @@
 
   <p:path><p:pathelement 
-    title="Relax" href="<%="../index.jsp?ID="+ID%>" 
+    title="Relax" href="<%="../index-admin.jsp?ID="+ID%>" 
     /><p:pathelement title="Installation wizard" 
     /></p:path>