Changeset 6954


Ignore:
Timestamp:
Sep 17, 2015, 9:32:52 AM (6 years ago)
Author:
Nicklas Nordborg
Message:

Merged patch release 3.5.3 to the trunk.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/core/net/sf/basedb/core/Trashcan.java

    r6444 r6954  
    212212    int numRemoved = 0;
    213213    int removedInTransaction = 0;
     214    int projectId = sc.getActiveProjectId();
    214215
    215216    DbControl dc = null;
     
    232233        try
    233234        {
     235          if (projectId != 0 && sc2.getActiveProjectId() != projectId)
     236          {
     237            sc2.setActiveProject(Project.getById(dc, projectId));
     238          }
     239
    234240          removedInTransaction = 0;
    235241          Iterator<Identifiable> iterator = itemsToRemove.iterator();
  • trunk/www/views/jobs/view_job.jsp

    r6880 r6954  
    164164  // Check if the job can be aborted
    165165  boolean supportsAbort = false;
    166   boolean supportsForceError = status != Job.Status.DONE && status != Job.Status.ERROR;
     166  boolean supportsForceError = writePermission && status != Job.Status.DONE && status != Job.Status.ERROR;
    167167 
    168168  // The status must be executable or EXECUTING
Note: See TracChangeset for help on using the changeset viewer.