-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #88 from Ensembl/merge_master_june
Merge master june
- Loading branch information
Showing
11 changed files
with
195 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,35 +42,35 @@ class Meta: | |
|
||
src_host = forms.CharField( | ||
label="Source Host (e.g: host:port)", | ||
max_length=80, | ||
max_length=2048, | ||
required=True) | ||
tgt_host = forms.CharField( | ||
label="Target Hosts (e.g: Host1:port1,Host2:port2)", | ||
max_length=80, | ||
max_length=2048, | ||
required=True) | ||
src_incl_db = forms.CharField( | ||
label="Databases to copy (e.g: db1,db2,.. or %variation_99% )", | ||
max_length=80, | ||
max_length=2048, | ||
required=False) | ||
src_skip_db = forms.CharField( | ||
label="Databases to exclude (e.g db1,db2 or %mart%)", | ||
max_length=80, | ||
max_length=2048, | ||
required=False) | ||
src_incl_tables = forms.CharField( | ||
label="Only Copy these tables (e.g: table1,table2,..):", | ||
max_length=80, | ||
max_length=2048, | ||
required=False) | ||
src_skip_tables = forms.CharField( | ||
label="Skip these tables (e.g: table1,table2)", | ||
max_length=80, | ||
max_length=2048, | ||
required=False) | ||
tgt_db_name = forms.CharField( | ||
label="Name of database on Target Hosts", | ||
max_length=80, | ||
label="Name of databases on Target Hosts (e.g: db1,db2)", | ||
max_length=2048, | ||
required=False) | ||
email_list = forms.CharField( | ||
label="Email list", | ||
max_length=80, | ||
max_length=2048, | ||
required=True) | ||
user = forms.CharField( | ||
widget=forms.HiddenInput()) | ||
|
@@ -125,7 +125,22 @@ def clean_email_list(self): | |
"Email list should be formatted like this [email protected] or [email protected],[email protected]") | ||
return data | ||
|
||
def clean_tgt_db_name(self): | ||
tgt_db_name = self.cleaned_data.get('tgt_db_name', '') | ||
src_incl_db = self.cleaned_data.get('src_incl_db', '') | ||
if tgt_db_name: | ||
if tgt_db_name.count(',') != src_incl_db.count(','): | ||
raise forms.ValidationError( | ||
"The number of databases to copy should match the number of databases renamed on target hosts") | ||
if '%' in src_incl_db: | ||
raise forms.ValidationError( | ||
"You can't rename a pattern") | ||
return tgt_db_name | ||
|
||
|
||
def __init__(self, *args, **kwargs): | ||
if 'initial' in kwargs and 'from_request_job' in kwargs['initial']: | ||
kwargs['instance'] = RequestJob.objects.get(pk=kwargs['initial']['from_request_job']) | ||
super(SubmitForm, self).__init__(*args, **kwargs) | ||
self.helper = FormHelper() | ||
self.fields["email_list"].initial = self.user.email | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# Generated by Django 2.2.13 on 2020-06-08 10:16 | ||
|
||
from django.db import migrations, models | ||
import django.utils.timezone | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('ensembl_dbcopy', '0001_initial'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterModelOptions( | ||
name='requestjob', | ||
options={'verbose_name': 'Copy job', 'verbose_name_plural': 'Copy jobs'}, | ||
), | ||
migrations.AddField( | ||
model_name='requestjob', | ||
name='request_date', | ||
field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), | ||
preserve_default=False, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,9 +46,6 @@ | |
top:3px; | ||
white-space: nowrap; | ||
} | ||
.btn { | ||
margin-bottom: 15px; | ||
} | ||
.table{ | ||
table-layout:fixed; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.