diff --git a/.gitignore b/.gitignore index e56e36c4c3..81ea946088 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ tmp version.jsp update_client.sh *.log -apollo-config.groovy +src/java/apollo-config.groovy gwt-unitCache/** web-app/WEB-INF/deploy/** web-app/annotator/** diff --git a/client/apollo/js/View/Track/AnnotTrack.js b/client/apollo/js/View/Track/AnnotTrack.js index 8af96fa921..38f5d56263 100644 --- a/client/apollo/js/View/Track/AnnotTrack.js +++ b/client/apollo/js/View/Track/AnnotTrack.js @@ -419,6 +419,7 @@ define([ var user = JSON.parse(apolloMainPanel.getCurrentUser()); client.subscribe("/topic/AnnotationNotification/" + organism.id + "/" + sequence.id, dojo.hitch(track, 'annotationNotification')); client.subscribe("/topic/AnnotationNotification/user/" + user.email, dojo.hitch(track, 'annotationNotification')); + localStorage.setItem('organism-id', organism.id); }); console.log('connection established'); }, diff --git a/client/apollo/js/View/Track/SequenceTrack.js b/client/apollo/js/View/Track/SequenceTrack.js index 006a9e4856..b0c1e1a9a1 100644 --- a/client/apollo/js/View/Track/SequenceTrack.js +++ b/client/apollo/js/View/Track/SequenceTrack.js @@ -1189,6 +1189,10 @@ function( declare, alert("Input cannot be empty for " + type); ok = false; } + if (commentFieldValue.length == 0) { + alert("Please provide a justification for the sequence modification (" + type + ") in the 'Comment' field."); + ok = false; + } if (ok) { var input = inputField.value.toUpperCase(); if (type === "deletion_artifact") { diff --git a/grails-app/services/org/bbop/apollo/ReportService.groovy b/grails-app/services/org/bbop/apollo/ReportService.groovy index 70541a9632..9bfcc3bd24 100644 --- a/grails-app/services/org/bbop/apollo/ReportService.groovy +++ b/grails-app/services/org/bbop/apollo/ReportService.groovy @@ -156,7 +156,7 @@ class ReportService { AnnotatorSummary generateAnnotatorSummary(User owner) { AnnotatorSummary annotatorSummary = new AnnotatorSummary() - + // get features created by the annotator def geneCount = Gene.executeQuery("select count(distinct g) from Gene g join g.owners owner where owner = :owner", [owner: owner])[0] def transposableElementCount = TransposableElement.executeQuery("select count(distinct g) from TransposableElement g join g.owners owner where owner = :owner", [owner: owner])[0] diff --git a/grails-app/views/auth/login.gsp b/grails-app/views/auth/login.gsp index 79014ffe73..9cea56914f 100644 --- a/grails-app/views/auth/login.gsp +++ b/grails-app/views/auth/login.gsp @@ -5,7 +5,7 @@ Login -
+
${flash.message}
 diff --git a/grails-app/views/google_analytics.gsp b/grails-app/views/google_analytics.gsp index 74e578e3c1..dc1cf3450e 100644 --- a/grails-app/views/google_analytics.gsp +++ b/grails-app/views/google_analytics.gsp @@ -5,26 +5,23 @@ Time: 4:05 PM --%> - + - - diff --git a/grails-app/views/login/doLogin.gsp b/grails-app/views/login/doLogin.gsp index 518015305a..4eb325f3bb 100644 --- a/grails-app/views/login/doLogin.gsp +++ b/grails-app/views/login/doLogin.gsp @@ -6,29 +6,23 @@ --%> <%@ page contentType="text/html;charset=UTF-8" %> + - + + + Login - -