Просмотр исходного кода

fix(templating): fixed issue with repeat row, was pretty buggy due to very recent change, fixes #2443

Torkel Ödegaard 10 лет назад
Родитель
Сommit
91e5fcf8f1
2 измененных файлов с 5 добавлено и 5 удалено
  1. 5 0
      CHANGELOG.md
  2. 0 5
      public/app/features/dashboard/dynamicDashboardSrv.js

+ 5 - 0
CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.1.1 (unreleased)
+
+**Fixes**
+- [Issue #2443](https://github.com/grafana/grafana/issues/2443). Templating: Fix for buggy repeat row behavior when combined with with repeat panel due to recent change before 2.1 release
+
 # 2.1.0 (2015-08-04)
 
 **Data sources**

+ 0 - 5
public/app/features/dashboard/dynamicDashboardSrv.js

@@ -53,10 +53,6 @@ function (angular, _) {
             row.panels = _.without(row.panels, panel);
             j = j - 1;
           }
-          // clean up left over scoped vars
-          else if (panel.scopedVars && panel.repeatIteration !== this.iteration) {
-            delete panel.scopedVars;
-          }
         }
       }
     };
@@ -120,7 +116,6 @@ function (angular, _) {
           panel = copy.panels[i];
           panel.scopedVars = {};
           panel.scopedVars[variable.name] = option;
-          panel.repeatIteration = self.iteration;
         }
       });
     };