Changeset 618


Ignore:
Timestamp:
08/23/14 06:17:03 (5 years ago)
Author:
jls17
Message:
  • added SchemaAudit? file naming in FileNaming?.cpp
  • in the breadcrumb area audit forms are now shown as "Audit" instead of "Regular" and the link activates the Audit filter on the all-schema-list page
Location:
branches/work_311
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/work_311/ARInside.cpp

    r615 r618  
    7575#define VERSION_STR VERSION "." SVN_REV_STR " Beta" 
    7676#else 
    77 #define VERSION_STR VERSION "." SVN_REV_STR " DevBuild" 
     77#define VERSION_STR VERSION "." SVN_REV_STR 
    7878#endif 
    7979const string AppVersion = VERSION_STR; 
     
    10841084                case AR_SCHEMA_DIALOG: page = PAGE_SCHEMA_DIALOG; break; 
    10851085                case AR_SCHEMA_VENDOR: page = PAGE_SCHEMA_VENDOR; break; 
     1086                case AR_SCHEMA_AUDIT: page = PAGE_SCHEMA_AUDIT; break; 
    10861087        } 
    10871088 
  • branches/work_311/doc/DocFieldDetails.cpp

    r558 r618  
    5555                stringstream contHeadStrm; 
    5656                contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel, false) << endl; 
    57                 contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schemaType, rootLevel) << endl; 
     57                contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schema.GetInternalSchemaType(), rootLevel) << endl; 
    5858                contHeadStrm << MenuSeparator << URLLink(this->schema, rootLevel) << endl; 
    5959                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
     
    135135 
    136136                //Join Form References 
    137                 if(this->schema.GetCompound().schemaType != AR_SCHEMA_DIALOG) 
     137                if(schemaType != AR_SCHEMA_DIALOG) 
    138138                { 
    139139                        tmp = this->JoinFormReferences(); 
  • branches/work_311/doc/DocSchemaDetails.cpp

    r616 r618  
    7171                        stringstream contHeadStrm; 
    7272                        contHeadStrm << CWebUtil::LinkToSchemaIndex(rootLevel, false) << endl; 
    73                         contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(compSchema.schemaType, rootLevel) << endl; 
     73                        contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schema.GetInternalSchemaType(), rootLevel) << endl; 
    7474                        contHeadStrm << MenuSeparator << ImageTag(schema, rootLevel) << CWebUtil::ObjName(this->schema.GetName()); 
    7575                        contHeadStrm << CAREnum::GetOverlayTypeString(overlayType); 
  • branches/work_311/doc/DocVuiDetails.cpp

    r551 r618  
    4646                stringstream contHeadStrm; 
    4747                contHeadStrm << CWebUtil::LinkToSchemaIndex(this->rootLevel, false) << endl; 
    48                 contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schemaType, this->rootLevel) << endl; 
     48                contHeadStrm << MenuSeparator << this->pInside->LinkToSchemaTypeList(schema.GetInternalSchemaType(), this->rootLevel) << endl; 
    4949                contHeadStrm << MenuSeparator << URLLink(this->schema, rootLevel); 
    5050                if (overlayHelper.IsOriginal() || overlayHelper.IsCustom()) 
  • branches/work_311/output/FileNaming.cpp

    r555 r618  
    256256        virtual string GetFileName() const { return FILE_INDEX; } 
    257257        virtual string GetFullFileName() const { return GetPath() + "/" + CWebUtil::DocName(GetFileName()) + "#vendor"; } 
     258        virtual string GetPath() const { return DIR_SCHEMA; } 
     259        virtual unsigned int GetRootLevel() const { return 1; } 
     260}; 
     261 
     262class SchemaAudit : public IFileStructure 
     263{ 
     264public: 
     265        SchemaAudit() { } 
     266        virtual string GetFileName() const { return FILE_INDEX; } 
     267        virtual string GetFullFileName() const { return GetPath() + "/" + CWebUtil::DocName(GetFileName()) + "#audit"; } 
    258268        virtual string GetPath() const { return DIR_SCHEMA; } 
    259269        virtual unsigned int GetRootLevel() const { return 1; } 
     
    13571367                case PAGE_SCHEMA_DIALOG: return new SchemaDialog(); 
    13581368                case PAGE_SCHEMA_VENDOR: return new SchemaVendor(); 
     1369                case PAGE_SCHEMA_AUDIT: return new SchemaAudit(); 
    13591370 
    13601371                case PAGE_FILTER_ERRORHANDLERS: return new FilterErrorHandlerOverview(); 
     
    24712482                case PAGE_SCHEMA_DIALOG: return new SchemaDialog(); 
    24722483                case PAGE_SCHEMA_VENDOR: return new SchemaVendor(); 
     2484                case PAGE_SCHEMA_AUDIT: return new SchemaAudit(); 
    24732485 
    24742486                case PAGE_SCHEMA_FIELDS_CSV: assert(params.obj1 != NULL && params.obj1->GetServerObjectTypeXML() == AR_STRUCT_ITEM_XML_SCHEMA); return new ObjectNameSchemaFieldsCSV(static_cast<const CARSchema*>(params.obj1)); 
  • branches/work_311/output/IFileStructure.h

    r525 r618  
    178178const unsigned int PAGE_SCHEMA_VUIFIELDS_CSV = 1016; 
    179179 
     180// === PAGE_SCHEMA_AUDIT === 
     181// CPageParams: none 
     182const unsigned int PAGE_SCHEMA_AUDIT = 1017; 
     183 
    180184// === PAGE_GROUP_SCHEMA_LIST === 
    181185// CPageParams: data1 = groupObj 
Note: See TracChangeset for help on using the changeset viewer.