← Back to branch summary

~lifeeth/sahana-eden/ifrc

« back to all changes in this revision

Viewing changes to modules/eden/irs.py

  • Committer: Fran Boon
  • Date: 2012-01-18 14:26:52 UTC
  • mfrom: (1875.1.1269 eden)
  • Revision ID: fran@aidiq.com-20120118142652-1p2fvpmr0xfkfy2z
merge Trunk: S3Compose() RESTful method available from all Search results, Break up PR into more classes

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/eden/irs.py
571
571
                                 url = url)
572
572
 
573
573
            # Maintain RHeader for consistency
574
 
            rheader = irs_rheader(r)
575
 
            output["rheader"] = rheader
 
574
            if "rheader" in attr:
 
575
                output["rheader"] = attr["rheader"](r)
576
576
 
577
577
            output["title"] = T("Send Dispatch Update")
578
578
            response.view = "msg/compose.html"
609
609
            itable = s3db.doc_image
610
610
            dtable = s3db.doc_document
611
611
 
612
 
            output = dict()
613
 
 
614
 
            if r.id:
615
 
                # Maintain RHeader for consistency
616
 
                rheader = irs_rheader(r)
617
 
                output.update(rheader=rheader)
618
 
 
619
612
            # Create the DIV
620
613
            item = DIV(_id="s3timeline", _style="height: 400px; border: 1px solid #aaa; font-family: Trebuchet MS, sans-serif; font-size: 85%;")
621
614
 
740
733
    S3.timeline.onResize();
741
734
});""")
742
735
 
 
736
            output = dict(item = item)
 
737
 
 
738
            # Maintain RHeader for consistency
 
739
            if "rheader" in attr:
 
740
                output["rheader"] = attr["rheader"](r)
 
741
 
743
742
            title = T("Incident Timeline")
744
 
 
745
 
            output.update(title=title, item=item)
 
743
            output["title"] = title
746
744
            response.view = "timeline.html"
747
745
            return output
748
746