Merge branch 'gsoc18'
diff --git a/webapps/proteus-new/src/main/webapp/resources/src/components/projectstable.vue b/webapps/proteus-new/src/main/webapp/resources/src/components/projectstable.vue
index 6f47cf2..a44316d 100644
--- a/webapps/proteus-new/src/main/webapp/resources/src/components/projectstable.vue
+++ b/webapps/proteus-new/src/main/webapp/resources/src/components/projectstable.vue
@@ -217,10 +217,11 @@
store,
props: [],
mounted() {
+ this.loadData();
this.timerClearVar= setInterval(function () {
this.loadData();
- }.bind(this), 1000);
- this.loadData();
+ }.bind(this), 10000);
+
},
beforeDestroy(){
@@ -286,6 +287,18 @@
this.docs=response.data.response.docs;
this.count.numFound = response.data.response.numFound;
this.count.start = response.data.response.start;
+ if(response.data.response.numFound>10){
+ axios.get(this.origin+"/solr/statistics/select?q=type:project&&rows="+this.count.numFound+"&wt=json")
+ .then(response=>{
+ this.docs=response.data.response.docs;
+ this.count.numFound = response.data.response.numFound;
+ this.count.start = response.data.response.start;
+ })
+ .catch(error=>{
+
+ })
+ }
+
})
.catch(error=>{
