Merge branch '2-14-stable' into develop

Author: fiftin

db/sql/migrations/v2.14.1.sql

@@ -1,2 +1,2 @@
-alter table `project__integration_extract_value` add `variable_type` varchar(255) not null;
+alter table `project__integration_extract_value` add `variable_type` varchar(255);
 update `project__integration_extract_value` set `variable_type` = 'environment' where `variable_type` is null or `variable_type` = '';

db/sql/session.go

@@ -61,7 +61,7 @@ func (d *SqlDb) GetSession(userID int, sessionID int) (session db.Session, err e
 }
 
 func (d *SqlDb) ExpireSession(userID int, sessionID int) error {
-	res, err := d.exec("update session set expired=1 where id=? and user_id=?", sessionID, userID)
+	res, err := d.exec("update session set expired=true where id=? and user_id=?", sessionID, userID)
 
 	return validateMutationResult(res, err)
 }

web/src/components/SurveyVars.vue

@@ -63,6 +63,7 @@
                       flat
                       hide-details
                       v-model="props.item.name"
+                      :label="$t('matchKey')"
                       class="v-text-field--solo--no-min-height"
                     ></v-text-field>
                   </td>
@@ -72,6 +73,7 @@
                       flat
                       hide-details
                       v-model="props.item.value"
+                      :label="$t('matchValue')"
                       class="v-text-field--solo--no-min-height"
                     ></v-text-field>
                   </td>
@@ -101,8 +103,9 @@
               v-model="editedVar.default_value"
               :label="$t('default_value')"
               :items="editedValues"
-              item-value="name"
-              item-text="value"
+              item-value="value"
+              item-text="name"
+              clearable
             ></v-select>
 
             <v-text-field