Merge pull-request #1350

app/Template/custom_filter/add.php

@@ -15,6 +15,8 @@
     <?php if ($this->user->isProjectManagementAllowed($project['id'])): ?>
         <?= $this->form->checkbox('is_shared', t('Share with all project members'), 1) ?>
     <?php endif ?>
+    
+    <?= $this->form->checkbox('append', t('Append filter (instead of replacement)'), 1) ?>
 
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">

app/Template/custom_filter/edit.php

@@ -21,7 +21,9 @@
     <?php else: ?>
         <?= $this->form->hidden('is_shared', $values) ?>
     <?php endif ?>
-
+    
+    <?= $this->form->checkbox('append', t('Append filter (instead of replacement)'), 1, $values['append'] == 1) ?>
+    
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
         <?= t('or') ?>

app/Template/custom_filter/index.php

@@ -8,6 +8,7 @@
             <th><?= t('Name') ?></th>
             <th><?= t('Filter') ?></th>
             <th><?= t('Shared') ?></th>
+            <th><?= t('Append/Replace') ?></th>
             <th><?= t('Owner') ?></th>
             <th><?= t('Actions') ?></th>
         </tr>
@@ -22,6 +23,13 @@
                 <?= t('No') ?>
             <?php endif ?>
             </td>
+            <td>
+            <?php if ($filter['append'] == 1): ?>
+                <?= t('Append') ?>
+            <?php else: ?>
+                <?= t('Replace') ?>
+            <?php endif ?>
+            </td>
             <td><?= $this->e($filter['owner_name'] ?: $filter['owner_username']) ?></td>
             <td>
                 <?php if ($filter['user_id'] == $this->user->getId() || $this->user->isProjectManagementAllowed($project['id'])): ?>
@@ -37,4 +45,4 @@
 </div>
 <?php endif ?>
 
-<?= $this->render('custom_filter/add', array('project' => $project, 'values' => $values, 'errors' => $errors)) ?>
+<?= $this->render('custom_filter/add', array('project' => $project, 'values' => $values, 'errors' => $errors)) ?>

app/Template/project/filters.php

@@ -68,7 +68,7 @@
             <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('My filters') ?></a>
             <ul>
                 <?php foreach ($custom_filters_list as $filter): ?>
-                    <li><a href="#" class="filter-helper" data-filter='<?= $this->e($filter['filter']) ?>'><?= $this->e($filter['name']) ?></a></li>
+                    <li><a href="#" class="filter-helper" data-<?php if($filter['append']): ?><?= 'append-' ?><?php endif ?>filter='<?= $this->e($filter['filter']) ?>'><?= $this->e($filter['name']) ?></a></li>
                 <?php endforeach ?>
             </ul>
             </div>