modification for email

src/ng6/ng6workflow.py

@@ -38,10 +38,7 @@ class BasicNG6Workflow (Workflow):
     def __init__(self, args={}, id=None, function= "process"):
         Workflow.__init__(self, args, id, function)
         self.add_parameter("admin_login", "Who is the project administrator", required = True, type = adminlogin, display_name="Admin login")
-        self.add_parameter("to", "The email address, and optionally name of the message's recipient", group="Email")
-        self.add_parameter("subject", "A brief summary of the topic of the message", group="Email")
-        self.add_parameter("message", "The content of the message", group="Email")
-        
+    
     def add_component(self, component_name, args=[], kwargs={}, component_prefix="default", parent=None, addto="run"):
         # first build and check if this component is OK
         if self.comp_pckg.has_key(component_name):

ui/nG6/pi1/analyzes/AnalysisTemplate.tpl

@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <input type="hidden" id="server_url" value="{$server_url}" />
 <input type="hidden" id="user_login" value="{$user_login}" />
 <input type="hidden" id="user_id" value="{$user_id}" />
-<input type="hidden" id="user_email" value="{$user_email}" />
 
 <div class="sub-content sc-top">
 	{block name=description}

ui/nG6/pi1/class.tx_nG6_pi1.php

@@ -201,8 +201,6 @@ class tx_nG6_pi1 extends tslib_pibase {
 			$smarty->assign('server_url', $this->conf['server_url']);
 			$smarty->assign('single_project_display', $single_project_display);
 			$smarty->assign('is_ng6_admin', tx_nG6_db::is_ng6_administrator($user_id) ? true : false);
-			$userval = tx_nG6_db::get_user_informations($user_id);
-			$smarty->assign('user_email', $userval['email']);
 			
 			// If it's a single project, add runs and analysis information
 			if ($single_project_display) {
@@ -292,8 +290,6 @@ class tx_nG6_pi1 extends tslib_pibase {
 			$smarty->assign('server_url', $this->conf['server_url']);
 			$smarty->assign('run_ids', substr($run_ids,0,-1));
 			$smarty->assign('single_run_display', $single_run_display);
-			$userval = tx_nG6_db::get_user_informations($user_id);
-			$smarty->assign('user_email', $userval['email']);
 			
 			// If it's a single run, add analysis information
 			if ($single_run_display) {
@@ -367,8 +363,6 @@ class tx_nG6_pi1 extends tslib_pibase {
 			$smarty->assign('server_url', $this->conf['server_url']);
 			$smarty->assign('user_login', $GLOBALS['TSFE']->fe_user->user['username']);
 			$smarty->assign('user_id', $GLOBALS['TSFE']->fe_user->user['uid']);
-			$userval = tx_nG6_db::get_user_informations($user_id);
-			$smarty->assign('user_email', $userval['email']);
 			
 			// Then select analyse results
 			$results = tx_nG6_db::select_analyse_results($this->piVars['analyze_id']);		

ui/nG6/pi1/project_view.tpl

@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <input type="hidden" id="ids" value="{$project_ids}" />
 <input type="hidden" id="login_user" value="{$login_user}" />
 <input type="hidden" id="server_url" value="{$server_url}" />
-<input type="hidden" id="user_email" value="{$user_email}" />
 
 {* If no project can be displayed *}
 {if $projects|@count == 0 || ($projects|@count == 1 && $projects[key($projects)].hidden == 1 && !$projects[key($projects)].is_admin)}

ui/nG6/pi1/run_view.tpl

@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <input type="hidden" id="login_user" value="{$login_user}" />
 <input type="hidden" id="user_login" value="{$user_login}" />
 <input type="hidden" id="server_url" value="{$server_url}" />
-<input type="hidden" id="user_email" value="{$user_email}" />
 
 {* If no runs can be displayed *}
 {if $runs|@count == 0 || ($runs|@count == 1 && $runs[key($runs)].hidden == 1 && !$runs[key($runs)].is_admin) }

ui/nG6/pi6/administration_view.tpl

@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <input type="hidden" id="data_folder" value="{$data_folder}" />
 <input type="hidden" id="usergroup" value="{$group_info.uid}" />
 <input type="hidden" id="server_url" value="{$server_url}" />
-<input type="hidden" id="user_email" value="{$user_email}" />
 
 <div class="sub-content sc-top">	
 	<div class="ng6-content-header-left administration">

ui/nG6/pi6/class.tx_nG6_pi6.php

@@ -103,8 +103,6 @@ class tx_nG6_pi6 extends tslib_pibase {
 		$distribution = tx_nG6_db::select_projects_repartition('create_user', 'title');
 		$smarty->assign('distribution', $distribution);
 		$smarty->assign('ng6_admin_users', tx_nG6_db::get_ng6_admin_users() );
-		$userval = tx_nG6_db::get_user_informations($GLOBALS['TSFE']->fe_user->user['uid']);
-		$smarty->assign('user_email', $userval['email']);
 		return $smarty->fetch('administration_view.tpl');
 	}
 }

ui/nG6/res/js/tx_nG6_pi1.js

@@ -1883,9 +1883,6 @@ function addRunHandler() {
     	}
     	parameters["metadata"] = [];
     	parameters["admin_login"] = $("#user_login").val();
-    	parameters["to"] = $('#user_email').val();
-    	parameters["subject"] = null;
-    	parameters["message"] = null;
     	
 	    $('#wfForm').wfform({
 			workflowClass: workflow["class"],
@@ -2077,9 +2074,6 @@ function addFileHandler( event ){
     } 
     parameters["metadata"] = [];
 	parameters["admin_login"] = $("#user_login").val();
-	parameters["to"] = $('#user_email').val();
-	parameters["subject"] = null;
-	parameters["message"] = null;
 	
 	$("#close").show();
 	$('#wfForm').on("loaded", function(event, workflow) {
@@ -2164,9 +2158,6 @@ function addAnalysisHandler(){
     }
     parameters["metadata"] = [];
 	parameters["admin_login"] = $("#user_login").val();
-	parameters["to"] = $('#user_email').val();
-	parameters["subject"] = null;
-	parameters["message"] = null;
 	
 	$('#wfForm').on("loaded", function(event, workflow) {
 		$('#setAndRunModalLabel').html(workflow["name"] + " <small>" + workflow["help"] + "</small>");