diff --git a/models/JupyterRequestNew.php b/models/JupyterRequestNew.php
index 01f6a10..dbe00df 100644
--- a/models/JupyterRequestNew.php
+++ b/models/JupyterRequestNew.php
@@ -212,8 +212,9 @@ public function uploadNew($requestId)
$username = User::returnUsernameById($request->submitted_by);
$message_autoaccept="We are happy to inform you that your project '$project->name' has been automatically approved.
You can access the project resources via the " . Yii::$app->params['name'] . " website";
- $message_autoaccept_mod="We would like to inform you that the On-demand computation project '$project->name', submitted by user $username, has been automatically approved.";
-
+ // $message_autoaccept_mod="We would like to inform you that the On-demand computation project '$project->name', submitted by user $username, has been automatically approved.";
+ $message_autoaccept_mod="We would like to inform you that the On-demand notebooks project '$project->name', submitted by user $username, has been automatically approved.";
+
}
else
@@ -332,7 +333,7 @@ public function uploadNewEdit($requestId,$uchanged)
$username = User::returnUsernameById($submitted_by);
$warnings= 'Your request'.$autoaccept_allowed.' will be reviewed.';
$project_id=$project->id;
- $message="The books project '$project->name', created by user $username, has been modified and is pending approval.";
+ $message="The On-demand notebooks project '$project->name', created by user $username, has been modified and is pending approval.";
EmailEventsModerator::NotifyByEmail('edit_project', $project_id,$message);
}
diff --git a/models/ProjectRequest.php b/models/ProjectRequest.php
index 7e3e9ac..dc095fb 100644
--- a/models/ProjectRequest.php
+++ b/models/ProjectRequest.php
@@ -332,7 +332,7 @@ public function uploadNew($project_type)
} elseif ($project_type == 3){
$project_typen = "Machine Compute";
} else {
- $project_typen = "Jupyter Notebook";
+ $project_typen = "On-demand Notebooks";
}
Yii::$app->db->createCommand()->update('project',['pending_request_id'=>$request_id], "id='$project_id'")->execute();
diff --git a/views/project/edit_cold_storage.php b/views/project/edit_cold_storage.php
index 6f50b52..3be5af4 100644
--- a/views/project/edit_cold_storage.php
+++ b/views/project/edit_cold_storage.php
@@ -76,6 +76,7 @@
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
+ 'options' => array('readonly' => 'readonly'),
'pluginOptions' => [
'endDate'=>"+".($upperlimits->duration-$interval)."D",
'autoclose'=>true,
@@ -87,6 +88,7 @@
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
+ 'options' => array('readonly' => 'readonly'),
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d'
diff --git a/views/project/edit_jupyter.php b/views/project/edit_jupyter.php
index 0bee833..a56f2a7 100644
--- a/views/project/edit_jupyter.php
+++ b/views/project/edit_jupyter.php
@@ -90,8 +90,10 @@
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
+ 'options' => array('readonly' => 'readonly'),
'pluginOptions' => [
'endDate'=>"+".($upperlimits->duration-$interval)."D",
+ 'readonly' => 'true',
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
@@ -101,6 +103,7 @@
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
+ 'options' => array('readonly' => 'readonly'),
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d'
diff --git a/views/project/edit_machine_compute.php b/views/project/edit_machine_compute.php
index 88ac78f..f50282e 100644
--- a/views/project/edit_machine_compute.php
+++ b/views/project/edit_machine_compute.php
@@ -49,6 +49,7 @@