Commit 37d75905 by Torkel Ödegaard

Added min span option for panel repeater, #1888

parent 19812feb
...@@ -164,7 +164,7 @@ function (angular, _) { ...@@ -164,7 +164,7 @@ function (angular, _) {
_.each(selected, function(option, index) { _.each(selected, function(option, index) {
var copy = self.getPanelClone(panel, row, index); var copy = self.getPanelClone(panel, row, index);
copy.span = 12 / selected.length; copy.span = Math.max(12 / selected.length, panel.minSpan);
copy.scopedVars = copy.scopedVars || {}; copy.scopedVars = copy.scopedVars || {};
copy.scopedVars[variable.name] = option; copy.scopedVars[variable.name] = option;
}); });
......
...@@ -42,6 +42,14 @@ ...@@ -42,6 +42,14 @@
<option value=""></option> <option value=""></option>
</select> </select>
</li> </li>
<li class="tight-form-item">
Min span
</li>
<li>
<select class="input-small tight-form-input last" ng-model="panel.minSpan" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10,11,12]">
<option value=""></option>
</select>
</li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment