Skip to content

Commit d96f98b

Browse files
committed
fix duration format string
1 parent f664e78 commit d96f98b

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

dtable_events/automations/actions.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,15 @@ def send_selected_collaborator_notis(self, row_data):
213213
if user not in notify_users:
214214
notify_users.append(user)
215215
elif self.action_type == 'update_record':
216-
converted_row = self.auto_rule.get_convert_sql_row()
217-
row_id = converted_row['_id']
216+
sql_row = self.auto_rule.get_sql_row()
217+
row_id = sql_row['_id']
218218
for column_name, value in row_data.items():
219219
if column_name not in notify_column_names:
220220
continue
221-
old_value = converted_row.get(column_name) or []
221+
column = next(filter(lambda column: column['name'] == column_name, self.auto_rule.table_info['columns']), None)
222+
if not column:
223+
continue
224+
old_value = sql_row.get(column['key']) or []
222225
for user in (set(value) - set(old_value)):
223226
if user not in notify_users:
224227
notify_users.append(user)
@@ -1604,7 +1607,8 @@ class LinkRecordsAction(BaseAction):
16041607
ColumnTypes.COLLABORATOR: "is_exactly",
16051608
ColumnTypes.EMAIL: "is",
16061609
ColumnTypes.RATE: "equal",
1607-
ColumnTypes.AUTO_NUMBER: "is"
1610+
ColumnTypes.AUTO_NUMBER: "is",
1611+
ColumnTypes.DEPARTMENT_SINGLE_SELECT: "is"
16081612
}
16091613

16101614
VALID_COLUMN_TYPES = [

dtable_events/utils/message_formatters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,11 @@ def format_message(self, value):
436436
minutes = (abs(value) % 3600) // 60
437437
seconds = abs(value) % 60
438438
if duration_format == 'h:mm':
439-
value = '%s%d:%2d' % (prefix, hours, minutes)
439+
value = '%s%d:%02d' % (prefix, hours, minutes)
440440
elif duration_format == 'h:mm:ss':
441441
value = '%s%d:%02d:%02d' % (prefix, hours, minutes, seconds)
442442
else:
443-
value = '%s%d:%2d' % (prefix, hours, minutes)
443+
value = '%s%d:%02d' % (prefix, hours, minutes)
444444
return value
445445

446446

0 commit comments

Comments
 (0)