Changeset 9658 for main


Ignore:
Timestamp:
17 Nov 2012, 09:04:19 (12 years ago)
Author:
Henrik Bettermann
Message:

Replace reload button by a discreet icon.

Location:
main/waeup.kofa/trunk/src/waeup/kofa
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainerpage.pt

    r9647 r9658  
    2020        </td>
    2121        <td>
    22           <span tal:replace="python: entry[6]">CREATOR</span>
     22          <span tal:replace="python: entry[7]">CREATOR</span>
    2323        </td>
    2424        <td nowrap>
    25           <span tal:replace="python: entry[5]">DATETIME</span>
     25          <span tal:replace="python: entry[6]">DATETIME</span>
    2626        </td>
    2727        <td>
    … …  
    3838                   name="DISCARD" value="Discard"
    3939                   tal:condition="python: entry[3]" />
     40            <a href=""
     41                   tal:condition="python: entry[5]">
     42                   <img tal:attributes="src static/actionicon_reload.png" />
     43            </a>
    4044          </form>
    41         </td>
    42         <td>
    4345        </td>
    4446      </tr>
    4547    </tbody>
    4648  </table>
    47 
    4849  <div class="span12">
    49     <a href="" class="btn primary">Reload page</a>
    50     <a href="create" class="btn secondary">Create new report</a>
     50    <a href="create" class="btn primary">Create new report</a>
    5151  </div>
    5252</form>

  • main/waeup.kofa/trunk/src/waeup/kofa/reports.py

    r9647 r9658  
    476476            discardable = job.finished
    477477            downloadable = job.finished and not job.failed
     478            running = not (downloadable or discardable)
    478479            starttime = getattr(job, 'begin_after', None)
    479480            if starttime:
    … …  
    483484                continue
    484485            result.append((job_id, job.description, status,
    485                            discardable, downloadable, starttime, user_name),)
     486                           discardable, downloadable, running,
     487                           starttime, user_name),)
    486488        return result
    487489

  • main/waeup.kofa/trunk/src/waeup/kofa/tests/test_reports.py

    r9647 r9658  
    395395        self.assertEqual(
    396396            result,
    397             [('2', 'Report 1 ()', u'running', False, False, None, 'bob'),]
     397            [('2', 'Report 1 ()', u'running', False, False, True, None, 'bob'),]
    398398            )
    399399        return
Note: See TracChangeset for help on using the changeset viewer.