Changeset 539


Ignore:
Timestamp:
04/14/14 17:42:41 (5 years ago)
Author:
jls17
Message:
  • fixed a crash during the role documentation in case the application the role is referring to doesn't exist (#131)
  • in case the app of a role doesn't exist, there is no longer a invalid link on the roles overview page
Location:
branches/work_311
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/output/RoleTable.cpp

    r524 r539  
    5656 
    5757        CPageParams roleDetailPage(PAGE_DETAILS, &role); 
    58         CPageParams appDetailPage(PAGE_DETAILS, &app); 
    5958        Document::AllocatorType &alloc = doc.GetAllocator(); 
    6059 
     
    6766        string strModifiedDate = CUtil::DateTimeToString(role.GetTimestamp()); 
    6867        string strLink = CWebUtil::GetRelativeURL(rootLevel, roleDetailPage); 
    69         string strAppLink = (app.Exists() ? CWebUtil::GetRelativeURL(rootLevel, appDetailPage) : ""); 
     68        string strAppLink = (app.Exists() ? CWebUtil::GetRelativeURL(rootLevel, CPageParams(PAGE_DETAILS, &app)) : ""); 
    7069 
    7170        Value valName(strName.c_str(), static_cast<SizeType>(strName.size()), alloc); 
  • branches/work_311/res/roleList.js

    r471 r539  
    1515                                if (!this.typeFilter[i]) { allTypeOn = false; } 
    1616                        } 
    17                         return !(allTypeOff || allTypeOn)                        
     17                        return !(allTypeOff || allTypeOn) 
    1818                }) 
    1919                .onCheckTypeFilterForRow(function(row) { 
     
    4646        .append($("<td>") 
    4747                        .append(getIcon(rootLevel,12,2)) 
    48                         .append($("<a>").attr("href", data[6]).text(data[2])) 
     48                        .append((data[6] ? $("<a>").attr("href", data[6]).text(data[2]) : data[2] )) 
    4949                ) 
    5050        .append($("<td>").text(data[3])) 
Note: See TracChangeset for help on using the changeset viewer.