Merge pull request #1655 from josenavas/subdir-portals-misc

Fixing various files

qiita_pet/handlers/analysis_handlers.py

@@ -36,6 +36,7 @@
 from qiita_db.logger import LogEntry
 from qiita_db.reference import Reference
 from qiita_core.util import execute_as_transaction
+from qiita_core.qiita_settings import qiita_config
 
 SELECT_SAMPLES = 2
 SELECT_COMMANDS = 3
@@ -127,11 +128,13 @@ def post(self, analysis_id):
         cmd_split = [x.split("#") for x in command_args]
 
         moi_user_id = get_id_from_user(self.current_user.id)
-        moi_group = create_info(analysis_id, 'group', url='/analysis/',
-                                parent=moi_user_id, store=True)
+        moi_group = create_info(
+            analysis_id, 'group', url='%s/analysis/' % qiita_config.portal_dir,
+            parent=moi_user_id, store=True)
         moi_name = ("Creating %s... When finished, please click the 'Success' "
                     "link to the right" % analysis.name)
-        moi_result_url = '/analysis/results/%d' % analysis_id
+        moi_result_url = '%s/analysis/results/%d' % (qiita_config.portal_dir,
+                                                     analysis_id)
 
         submit(ctx_default, moi_group['id'], moi_name,
                moi_result_url, run_analysis, analysis_id, cmd_split,
@@ -206,7 +209,8 @@ def post(self, analysis_id):
             LogEntry.create('Runtime', "Couldn't remove analysis ID %d: %s" %
                             (analysis_id, e))
 
-        self.redirect(u"/analysis/show/?level=%s&message=%s" % (level, msg))
+        self.redirect(u"%s/analysis/show/?level=%s&message=%s"
+                      % (qiita_config.portal_dir, level, msg))
 
 
 class ShowAnalysesHandler(BaseHandler):
@@ -262,7 +266,8 @@ def post(self):
             LogEntry.create('Runtime', "Couldn't remove analysis ID %d: %s" %
                             (analysis_id, e))
 
-        self.redirect(u"/analysis/show/?level=%s&message=%s" % (level, msg))
+        self.redirect(u"%s/analysis/show/?level=%s&message=%s"
+                      % (qiita_config.portal_dir, level, msg))
 
 
 class ResultsHandler(StaticFileHandler, BaseHandler):

qiita_pet/handlers/auth_handlers.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 from tornado.escape import url_escape, json_encode
 from tornado.web import HTTPError
 
@@ -46,19 +44,21 @@ def post(self):
             try:
                 send_email(username, "QIITA: Verify Email Address", "Please "
                            "click the following link to verify email address: "
-                           "%s/auth/verify/%s?email=%s"
-                           % (qiita_config.base_url, info['user_verify_code'],
-                              url_escape(username)))
+                           "%s/%s/auth/verify/%s?email=%s"
+                           % (qiita_config.base_url, qiita_config.portal_dir,
+                              info['user_verify_code'], url_escape(username)))
             except:
                 msg = ("Unable to send verification email. Please contact the "
                        "qiita developers at <a href='mailto:qiita-help"
                        "@gmail.com'>qiita-help@gmail.com</a>")
-                self.redirect(u"/?level=danger&message=" + url_escape(msg))
+                self.redirect(u"%s/?level=danger&message=%s"
+                              % (qiita_config.portal_dir, url_escape(msg)))
                 return
-            self.redirect(u"/")
+            self.redirect(u"%s/" % qiita_config.portal_dir)
         else:
             error_msg = u"?error=" + url_escape(msg)
-            self.redirect(u"/auth/create/" + error_msg)
+            self.redirect(u"%s/auth/create/%s"
+                          % (qiita_config.portal_dir, error_msg))
 
 
 class AuthVerifyHandler(BaseHandler):
@@ -77,7 +77,7 @@ def get(self, code):
 class AuthLoginHandler(BaseHandler):
     """user login, no page necessary"""
     def get(self):
-        self.redirect("/")
+        self.redirect("%s/" % qiita_config.portal_dir)
 
     @execute_as_transaction
     def post(self):
@@ -91,7 +91,7 @@ def post(self):
             if "auth/" not in self.request.headers['Referer']:
                 nextpage = self.request.headers['Referer']
             else:
-                nextpage = "/"
+                nextpage = "%s/" % qiita_config.portal_dir
 
         msg = ""
         # check the user level
@@ -109,7 +109,7 @@ def post(self):
             # means DB not available, so set maintenance mode and failover
             r_client.set("maintenance", "Database connection unavailable, "
                          "please try again later.")
-            self.redirect("/")
+            self.redirect("%s/" % qiita_config.portal_dir)
             return
 
         # Check the login information
@@ -141,4 +141,4 @@ class AuthLogoutHandler(BaseHandler):
     """Logout handler, no page necessary"""
     def get(self):
         self.clear_cookie("user")
-        self.redirect("/")
+        self.redirect("%s/" % qiita_config.portal_dir)

qiita_pet/handlers/compute.py

@@ -8,6 +8,7 @@
 from qiita_ware.context import submit
 from qiita_ware.dispatchable import create_raw_data, copy_raw_data
 from qiita_core.util import execute_as_transaction
+from qiita_core.qiita_settings import qiita_config
 from qiita_db.util import get_mountpoint
 from qiita_db.metadata_template.prep_template import PrepTemplate
 
@@ -23,7 +24,7 @@ def get(self, job_id):
             # TODO: something smart
             pass
 
-        self.redirect('/')
+        self.redirect('%s/' % qiita_config.portal_dir)
 
 
 class CreateRawData(BaseHandler):
@@ -82,5 +83,6 @@ def post(self):
         self.render('compute_wait.html',
                     job_id=job_id, title='Adding raw data',
                     completion_redirect=(
-                        '/study/description/%s?top_tab=prep_template_tab'
-                        '&sub_tab=%s' % (study_id, pt_id)))
+                        '%s/study/description/%s?top_tab=prep_template_tab'
+                        '&sub_tab=%s'
+                        % (qiita_config.portal_dir, study_id, pt_id)))

qiita_pet/static/js/analysis.js

@@ -19,14 +19,14 @@ function displaySelected() {
     seldiv.style.display = "none";
     linktext.innerHTML = "Show selected samples";
   }
-} 
+}
 
 function select_category(category, study) {
-  if(study != '') { 
+  if(study != '') {
     $('.'+study+'.'+category).each(function() {this.checked = true;});
     count_update(study);
   }
-  else { 
+  else {
     $('.'+category).each(function() {this.checked = true;});
     for(i=0; i<STUDIES.length; i++) {
       count_update(STUDIES[i]);
@@ -45,7 +45,7 @@ function count_update(study) {
   var selected = $('#modal' + study + ' input:checkbox:checked').length;
   var studylink = document.getElementById('modal-link-' + study)
   document.getElementById('count' + study).innerHTML = selected;
-  if(selected > 0) { 
+  if(selected > 0) {
     $('#study' + study).addClass('success');
     studylink.disabled = false;
     studylink.style = "";
@@ -59,10 +59,10 @@ function count_update(study) {
 }
 
 function select_deselect(study, select) {
-  if(select == true) { 
+  if(select == true) {
     $('.'+study).each(function() {this.checked = true;});
   }
-  else { 
+  else {
     $('.'+study).each(function() {this.checked = false;});
   }
   count_update(study);
@@ -74,27 +74,3 @@ function select_inverse(study) {
     else { this.checked = true; }
   });
 }
-
-function pre_submit(action) {
-  document.getElementById('action').value = action;
-  var msgdiv = document.getElementById('searchmsg');
-  if(action == 'search') {
-    msgdiv.style.color = '';
-    msgdiv.style.align = 'center';
-    msgdiv.innerHTML = '<img src="/static/img/waiting.gif"> <b>Searching...</b>';
-  } else if(action == 'continue') {
-    var selected = $('#selected input:checkbox').length;
-    if(selected == 0) {
-      msgdiv.innerHTML = "Must select samples to continue!"
-      return false;
-    } else {
-    document.getElementById('results-form').action = '/analysis/3'
-    }
-  } else if(action == "deselect") {
-    var selected = $('#selected input:checkbox:checked').length;
-    if(selected == 0) {
-      msgdiv.innerHTML = "Must select samples to remove from study!"
-      return false;
-    }
-  }
-}