Changeset 599


Ignore:
Timestamp:
08/13/14 18:04:54 (5 years ago)
Author:
jls17
Message:
  • new "inline form" option is now documented in open window actions
Location:
branches/work_311/doc/actions
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/doc/actions/DocOpenWindowAction.cpp

    r595 r599  
    3838                string openWindowSchemaName; 
    3939                CARSchema attachedSchema(context.getCurrentSchemaId()); 
     40                CDocActionOpenWindowHelper reportData(action.reportString); 
    4041 
    4142                // check if we need to get the sample data 
     
    8081                        strm << endl; 
    8182                } 
     83 
     84                // show "inline form" option 
     85                if (ActionOpenDlgInlineForm(windowMode)) 
     86                { 
     87                        strm << "<br/><input type=\"checkbox\" name=\"inlineForm\" value=\"inline\" " << (reportData.getInlineForm().compare("true")==0 ? "checked" : "") << ">Inline Form<br/>" << endl; 
     88                } 
     89 
    8290                strm << "</p>" << endl; 
    8391 
     
    172180                string *reportOperation = NULL; 
    173181                string *charEncoding = NULL; 
     182                string *inlineForm = NULL; 
    174183                if (windowMode == AR_ACTIVE_LINK_ACTION_OPEN_REPORT) 
    175184                { 
     
    182191                        reportOperation = new string(); 
    183192                        charEncoding = new string(); 
    184  
    185                         if (!CDocActionOpenWindowHelper::GetReportData(action.reportString, reportType, reportLocation, reportName, reportDestination, *entryIDs, *queryOverride, *reportOperation, *charEncoding)) 
     193                        inlineForm = new string(); 
     194 
     195                        if (!CDocActionOpenWindowHelper::GetReportData(action.reportString, reportType, reportLocation, reportName, reportDestination, *entryIDs, *queryOverride, *reportOperation, *charEncoding, *inlineForm)) 
    186196                        { 
    187197                                strm << "<p>"; 
     
    444454                                delete reportOperation; 
    445455                                delete charEncoding; 
     456                                delete inlineForm; 
    446457                        } 
    447458 
     
    592603        } 
    593604} 
     605 
     606bool DocOpenWindowAction::ActionOpenDlgInlineForm(int nWindowType) 
     607{ 
     608        // The "Inline Form" option isn't displayed on open window actions of type Dialog, Report and Popup. Show it for all other types! 
     609 
     610        switch (nWindowType) 
     611        { 
     612        //case AR_ACTIVE_LINK_ACTION_OPEN_DLG: 
     613        case AR_ACTIVE_LINK_ACTION_OPEN_SEARCH: 
     614        case AR_ACTIVE_LINK_ACTION_OPEN_SUBMIT: 
     615        //case AR_ACTIVE_LINK_ACTION_OPEN_REPORT: 
     616        case AR_ACTIVE_LINK_ACTION_OPEN_MODIFY: 
     617        case AR_ACTIVE_LINK_ACTION_OPEN_DSPLY: 
     618#if AR_CURRENT_API_VERSION >= AR_API_VERSION_763 
     619        case AR_ACTIVE_LINK_ACTION_OPEN_MODIFY_DIRECT: 
     620        case AR_ACTIVE_LINK_ACTION_OPEN_DISPLAY_DIRECT: 
     621#endif 
     622        //case AR_ACTIVE_LINK_ACTION_OPEN_POPUP: 
     623                return true; 
     624        default: return false; 
     625        } 
     626} 
  • branches/work_311/doc/actions/DocOpenWindowAction.h

    r592 r599  
    3333        static bool ActionOpenDlgPoolingInterval(int nWindowType); 
    3434        static bool ActionOpenDlgMessage(int nWindowType); 
     35        static bool ActionOpenDlgInlineForm(int nWindowType); 
    3536 
    3637private: 
Note: See TracChangeset for help on using the changeset viewer.