equal
deleted
inserted
replaced
81 |
81 |
82 def __init__(self, vreg, https, form=None): |
82 def __init__(self, vreg, https, form=None): |
83 super(CubicWebRequestBase, self).__init__(vreg) |
83 super(CubicWebRequestBase, self).__init__(vreg) |
84 self.authmode = vreg.config['auth-mode'] |
84 self.authmode = vreg.config['auth-mode'] |
85 self.https = https |
85 self.https = https |
|
86 if https: |
|
87 self.uiprops = vreg.config.https_uiprops |
|
88 self.datadir_url = vreg.config.https_datadir_url |
|
89 else: |
|
90 self.uiprops = vreg.config.uiprops |
|
91 self.datadir_url = vreg.config.datadir_url |
86 # raw html headers that can be added from any view |
92 # raw html headers that can be added from any view |
87 self.html_headers = HTMLHead() |
93 self.html_headers = HTMLHead() |
88 # form parameters |
94 # form parameters |
89 self.setup_params(form) |
95 self.setup_params(form) |
90 # dictionnary that may be used to store request data that has to be |
96 # dictionnary that may be used to store request data that has to be |
97 # tabindex generator |
103 # tabindex generator |
98 self.tabindexgen = count(1) |
104 self.tabindexgen = count(1) |
99 self.next_tabindex = self.tabindexgen.next |
105 self.next_tabindex = self.tabindexgen.next |
100 # page id, set by htmlheader template |
106 # page id, set by htmlheader template |
101 self.pageid = None |
107 self.pageid = None |
102 self.datadir_url = vreg.config.datadir_url |
|
103 self._set_pageid() |
108 self._set_pageid() |
104 # prepare output header |
109 # prepare output header |
105 self.headers_out = Headers() |
110 self.headers_out = Headers() |
106 |
111 |
107 def _set_pageid(self): |
112 def _set_pageid(self): |
792 if self.xhtml_browser(): |
797 if self.xhtml_browser(): |
793 return (u'<?xml version="1.0"?>\n' + STRICT_DOCTYPE + # XXX encoding ? |
798 return (u'<?xml version="1.0"?>\n' + STRICT_DOCTYPE + # XXX encoding ? |
794 u'<div xmlns="http://www.w3.org/1999/xhtml" xmlns:cubicweb="http://www.logilab.org/2008/cubicweb">') |
799 u'<div xmlns="http://www.w3.org/1999/xhtml" xmlns:cubicweb="http://www.logilab.org/2008/cubicweb">') |
795 return u'<div>' |
800 return u'<div>' |
796 |
801 |
797 @deprecated('[3.9] use req.vreg.config.uiprops[rid]') |
802 @deprecated('[3.9] use req.uiprops[rid]') |
798 def external_resource(self, rid, default=_MARKER): |
803 def external_resource(self, rid, default=_MARKER): |
799 """return a path to an external resource, using its identifier |
804 """return a path to an external resource, using its identifier |
800 |
805 |
801 raise `KeyError` if the resource is not defined |
806 raise `KeyError` if the resource is not defined |
802 """ |
807 """ |
803 try: |
808 try: |
804 return self.vreg.config.uiprops[rid] |
809 return self.uiprops[rid] |
805 except KeyError: |
810 except KeyError: |
806 if default is _MARKER: |
811 if default is _MARKER: |
807 raise |
812 raise |
808 return default |
813 return default |
809 |
814 |