Browse Source

UI-2674: quick fix to sort pages in fax manager

UI-2978
Jean-Roch Maitre 9 years ago
parent
commit
45d5534542
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      app.js
  2. +2
    -2
      views/inbound-faxes-list.html
  3. +2
    -2
      views/outbound-faxes-list.html

+ 1
- 1
app.js View File

@ -397,7 +397,7 @@ define(function(require){
fax.formatted.receivingNumber = monster.util.formatPhoneNumber(fax.to_number);
fax.formatted.sendingFaxbox = self.appFlags.faxboxes.hasOwnProperty(fax.faxbox_id) ? self.appFlags.faxboxes[fax.faxbox_id].name : '-';
fax.formatted.sendingNumber = monster.util.formatPhoneNumber(fax.from_number);
fax.formatted.pages = details.hasOwnProperty('total_pages') ? details.total_pages : self.i18n.active().fax.table.noData;
fax.formatted.pages = details.hasOwnProperty('total_pages') ? details.total_pages : 0;
fax.formatted.uri = self.formatFaxURI(fax.id, type);
});


+ 2
- 2
views/inbound-faxes-list.html View File

@ -7,7 +7,7 @@
<th>{{ i18n.fax.table.columns.receivingFaxbox }}</th>
<th>{{ i18n.fax.table.columns.receivingNumber }}</th>
<th>{{ i18n.fax.table.columns.from }}</th>
<th data-breakpoints="xs">{{ i18n.fax.table.columns.pages }}</th>
<th data-breakpoints="xs" data-type="number">{{ i18n.fax.table.columns.pages }}</th>
<th data-filterable="false" data-type="html" data-sortable="false"></th>
</tr>
</thead>
@ -20,7 +20,7 @@
<input class="select-fax" type="checkbox" data-id="{{id}}"/>
{{/monsterCheckbox}}
</td>
<td data-sort-value="{{timestamp}}">{{formatted.timestamp}}</td>
<td data-sort-value="{{formatted.timestamp}}">{{formatted.timestamp}}</td>
<td>{{formatted.receivingFaxbox}}</td>
<td>{{formatted.receivingNumber}}</td>
<td>{{formatted.sendingNumber}}</td>


+ 2
- 2
views/outbound-faxes-list.html View File

@ -8,7 +8,7 @@
<th>{{ i18n.fax.table.columns.sendingFaxbox }}</th>
<th>{{ i18n.fax.table.columns.sendingNumber }}</th>
<th>{{ i18n.fax.table.columns.receivingNumber }}</th>
<th data-breakpoints="xs">{{ i18n.fax.table.columns.pages }}</th>
<th data-breakpoints="xs" data-type="number">{{ i18n.fax.table.columns.pages }}</th>
<th data-filterable="false" data-type="html" data-sortable="false"></th>
</tr>
</thead>
@ -24,7 +24,7 @@
<td class="status" data-sort-value="{{status}}" data-filter-value="{{status}}" data-status="{{status}}">
<span data-toggle="tooltip" data-placement="top" data-original-title="{{ formatted.error }}">{{status}}</span>
</td>
<td data-sort-value="{{timestamp}}">{{formatted.timestamp}}</td>
<td data-sort-value="{{formatted.timestamp}}">{{formatted.timestamp}}</td>
<td>{{formatted.sendingFaxbox}}</td>
<td>{{formatted.sendingNumber}}</td>
<td>{{formatted.receivingNumber}}</td>


Loading…
Cancel
Save