Merge pull request #16 from ggirelli/dev

v2.0.3.post1
ggirelli · Jul 24, 2019 · 2fe11e8 · 2fe11e8
2 parents 11720db + 80cf1aa
commit 2fe11e8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 
+## [2.0.3.post1] - 2019-07-24
+### Fixed
+- Bug crashing interface when no CUSTOM flags are present in a database.
+
+
+
 ## [2.0.3] - 2019-05-29
 ### Added
 - Option to easily add google analytics tokens to design interface.
@@ -114,6 +120,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.0.1] - 2017-08-06 - First release
 
 
+
+[2.0.3.post1] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.3.post1
 [2.0.3] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.3
 [2.0.2] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.2
 [2.0.1] https://github.com/ggirelli/iFISH-probe-design/releases/tag/v2.0.1

diff --git a/ifpd/sections/probe_design/views/databases.tpl b/ifpd/sections/probe_design/views/databases.tpl
@@ -33,18 +33,22 @@
 					<li class="list-group-item">
 						<b>Overlapping oligos:</b> {{config['OLIGOS']['overlaps']}}
 					</li>
-					%for k in [k for k in config['CUSTOM'].keys() if not k in ['reference', 'url']]:
-					<li class="list-group-item">
-						<b>{{k}}:</b> {{config['CUSTOM'][k]}}
-					</li>
+					%if "CUSTOM" in config.keys():
+						%for k in [k for k in config['CUSTOM'].keys() if not k in ['reference', 'url']]:
+						<li class="list-group-item">
+							<b>{{k}}:</b> {{config['CUSTOM'][k]}}
+						</li>
+						%end
 					%end
 				</ul>
 				<div class="card-body">
-					%if 'reference' in config['CUSTOM'].keys():
-					<p class="card-text reference"><b>Reference: </b>{{config['CUSTOM']['reference']}}</p>
-					%end
-					%if 'url' in config['CUSTOM'].keys():
-					<a href="{{config['CUSTOM']['url']}}" target="_new" class="card-link"><i class="fas fa-external-link-alt text-primary"></i> Database link</a>
+					%if "CUSTOM" in config.keys():
+						%if 'reference' in config['CUSTOM'].keys():
+						<p class="card-text reference"><b>Reference: </b>{{config['CUSTOM']['reference']}}</p>
+						%end
+						%if 'url' in config['CUSTOM'].keys():
+						<a href="{{config['CUSTOM']['url']}}" target="_new" class="card-link"><i class="fas fa-external-link-alt text-primary"></i> Database link</a>
+						%end
 					%end
 				</div>
 			</div></div>

diff --git a/ifpd/sections/probe_design/views/footer.tpl b/ifpd/sections/probe_design/views/footer.tpl
@@ -1,7 +1,7 @@
 
 <div class="row">
 	<div id="footer" class="col col-12">
-		iFISH Probe Designer v2.0.2 - &copy; Gabriele Girelli 2016-19
+		iFISH Probe Designer - &copy; Gabriele Girelli 2016-19
 	</div>
 </div>
 

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 	long_description = f.read()
 
 setup(name='ifpd',
-	version='2.0.3',
+	version='2.0.3.post1',
 	description='''An iFISH probe design pipeline, with web interface included.''',
 	long_description=long_description,
 	long_description_content_type='text/markdown',
@@ -27,6 +27,7 @@
 		'Topic :: Scientific/Engineering :: Bio-Informatics',
 		'License :: OSI Approved :: MIT License',
 		'Programming Language :: Python :: 3 :: Only',
+		'Programming Language :: Python :: 3.6'
 	],
 	keywords='biology cell DNA RNA FISH fluorescence hybridization bioimaging genome',
 	packages=["ifpd", "ifpd.sections", "ifpd.sections.probe_design"],
@@ -61,4 +62,4 @@
 	},
 	test_suite="nose.collector",
 	tests_require=["nose"],
-)
+)