Merge pull request #1151 from opf/fix/angular-timelines-show-warning-6364

Fix/angular timelines show warning 6364

app/assets/javascripts/angular/directives/timelines/timeline-table-container-directive.js

@@ -65,6 +65,7 @@ angular.module('openproject.timelines.directives')
         if(scope.updateToolbar) scope.updateToolbar();
 
         scope.underConstruction = false;
+        scope.warning = false;
 
         scope.timeline.getChart().scroll(function() {
           scope.timeline.adjustTooltip();
@@ -75,6 +76,12 @@ angular.module('openproject.timelines.directives')
         });
       };
 
+      showWarning = function(){
+        scope.underConstruction = false;
+        scope.warning = true;
+        scope.$apply();
+      };
+
       buildWorkPackageTable = function(timeline){
         if (timeline.isGrouping() && timeline.options.grouping_two_enabled) {
           timeline.secondLevelGroupingAdjustments();
@@ -98,10 +105,10 @@ angular.module('openproject.timelines.directives')
         try {
           window.clearTimeout(timeline.safetyHook);
 
-          if (rows.length > 0) {
+          if (scope.rows.length > 0) {
             completeUI();
           } else {
-            timeline.warn(I18n.t('js.label_no_data'), 'warning');
+            timeline.warn(I18n.t('js.label_no_data'), 'warning', this.showWarning);
           }
         } catch (e) {
           timeline.die(e);

app/assets/javascripts/angular/models/timelines/timeline.js

@@ -290,7 +290,7 @@ angular.module('openproject.timelines.models')
 
       throw error;
     },
-    warn: function(message, classes) {
+    warn: function(message, classes, viewCallback) {
       var root = this.getUiRoot();
 
       window.setTimeout(function() {
@@ -298,6 +298,9 @@ angular.module('openproject.timelines.models')
         // generate and display the error message.
         var warning = jQuery('<div class="' + classes + '">' + message + '</div>');
         root.empty().append(warning);
+        if (viewCallback) {
+          viewCallback();
+        }
 
       }, Timeline.DISPLAY_ERROR_DELAY);
     },

public/templates/timelines/timeline_table_container.html

@@ -1,4 +1,4 @@
-<div ng-class="{timeline: true, 'tl-under-construction': underConstruction}" >
+<div ng-class="{timeline: !warning, 'tl-under-construction': underConstruction}" >
   <div class="tl-left">
     <div class="tl-left-top tl-decoration"></div>
     <div class="tl-left-main">

public/templates/timelines/toolbar.html

@@ -1,4 +1,4 @@
-<div class="tl-toolbar">
+<div class="tl-toolbar" ng-show="!warning">
   <div class="tl-toolbar-container">
     <a href="javascript://" ng-if='timeline.USE_MODALS' ng-click="timeline.addPlanningElement()" title="{{I18n.t('js.timelines.new_work_package')}}" class="icon icon-add">
       <span class="hidden-for-sighted">{{ I18n.t('js.timelines.new_work_package') }}</span>