[IMP] remove OpenERP Enterprise old code
bzr revid: fp@openerp.com-20120827213212-cjhnn33eqnrn8mk1
This commit is contained in:
commit
420a4811b9
|
@ -104,12 +104,6 @@ class OpenERPSession(object):
|
|||
del state['config']
|
||||
return state
|
||||
|
||||
def openerp_entreprise(self):
|
||||
if not self._uid:
|
||||
return False
|
||||
else:
|
||||
return self.model('publisher_warranty.contract').status()['status'] == 'full'
|
||||
|
||||
def build_connection(self):
|
||||
conn = openerplib.Connection(self.config.connector, database=self._db, login=self._login,
|
||||
user_id=self._uid, password=self._password)
|
||||
|
|
|
@ -806,7 +806,6 @@ class Session(openerpweb.Controller):
|
|||
"context": req.session.get_context() if req.session._uid else {},
|
||||
"db": req.session._db,
|
||||
"login": req.session._login,
|
||||
"openerp_entreprise": req.session.openerp_entreprise(),
|
||||
}
|
||||
|
||||
@openerpweb.jsonrequest
|
||||
|
|
|
@ -193,29 +193,9 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
|
|||
on_traceback: function(error) {
|
||||
var self = this;
|
||||
var buttons = {};
|
||||
if (instance.session.openerp_entreprise) {
|
||||
buttons[_t("Send OpenERP Enterprise Report")] = function() {
|
||||
var $this = $(this);
|
||||
var issuename = $('#issuename').val();
|
||||
var explanation = $('#explanation').val();
|
||||
var remark = $('#remark').val();
|
||||
// Call the send method from server to send mail with details
|
||||
new instance.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [error.data,explanation,remark,issuename]).then(function(result){
|
||||
if (result === false) {
|
||||
alert('There was a communication error.');
|
||||
} else {
|
||||
$this.dialog('close');
|
||||
}
|
||||
});
|
||||
};
|
||||
buttons[_t("Dont send")] = function() {
|
||||
$(this).dialog("close");
|
||||
};
|
||||
} else {
|
||||
buttons[_t("Ok")] = function() {
|
||||
$(this).dialog("close");
|
||||
};
|
||||
}
|
||||
buttons[_t("Ok")] = function() {
|
||||
$(this).dialog("close");
|
||||
};
|
||||
var dialog = new instance.web.Dialog(this, {
|
||||
title: "OpenERP " + _.str.capitalize(error.type),
|
||||
width: '80%',
|
||||
|
@ -1043,10 +1023,6 @@ instance.web.WebClient = instance.web.Client.extend({
|
|||
self.user_menu.on_action.add(this.proxy('on_menu_action'));
|
||||
self.user_menu.do_update();
|
||||
self.bind_hashchange();
|
||||
if (!self.session.openerp_entreprise) {
|
||||
var version_label = _t("OpenERP - Unsupported/Community Version");
|
||||
self.$el.find('.oe_footer_powered').append(_.str.sprintf('<span> - <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">%s</a></span>', version_label));
|
||||
}
|
||||
self.set_title();
|
||||
},
|
||||
destroy_content: function() {
|
||||
|
|
|
@ -35,7 +35,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
|
|||
this.username = false;
|
||||
this.user_context= {};
|
||||
this.db = false;
|
||||
this.openerp_entreprise = false;
|
||||
this.module_list = instance._modules.slice();
|
||||
this.module_loaded = {};
|
||||
_(this.module_list).each(function (mod) {
|
||||
|
@ -78,8 +77,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
|
|||
db: result.db,
|
||||
username: result.login,
|
||||
uid: result.uid,
|
||||
user_context: result.context,
|
||||
openerp_entreprise: result.openerp_entreprise
|
||||
user_context: result.context
|
||||
});
|
||||
});
|
||||
},
|
||||
|
@ -103,8 +101,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
|
|||
db: result.db,
|
||||
username: result.login,
|
||||
uid: result.uid,
|
||||
user_context: result.context,
|
||||
openerp_entreprise: result.openerp_entreprise
|
||||
user_context: result.context
|
||||
});
|
||||
if (!_volatile) {
|
||||
self.set_cookie('session_id', self.session_id);
|
||||
|
|
|
@ -12,7 +12,6 @@ openerp.test_support = {
|
|||
username: false,
|
||||
user_context: {},
|
||||
db: false,
|
||||
openerp_entreprise: false,
|
||||
// this.module_list = openerp._modules.slice();
|
||||
// this.module_loaded = {};
|
||||
// _(this.module_list).each(function (mod) {
|
||||
|
|
|
@ -51,29 +51,6 @@
|
|||
</table>
|
||||
</t>
|
||||
<t t-name="CrashManager.error">
|
||||
<t t-if="!session.openerp_entreprise">
|
||||
<span>Your version of OpenERP is unsupported. Support & maintenance services are available here: <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">OpenERP Entreprise</a>.</span>
|
||||
</t>
|
||||
<t t-if="session.openerp_entreprise">
|
||||
<div class="oe_error_send">
|
||||
<div>
|
||||
<div class="oe_centeralign"><b>OpenERP Enterprise Contract.</b></div>
|
||||
<div><br/>Your report will be sent to the OpenERP Enterprise team.<br/></div><br/>
|
||||
<div>
|
||||
<label>Summary:</label><br/>
|
||||
<input id="issuename" type="text" class="oe_fielddiv"/>
|
||||
</div><br/><br/>
|
||||
<div>
|
||||
<label>Description:</label><br/>
|
||||
<textarea id="explanation" rows="6"></textarea>
|
||||
</div><br/><br/>
|
||||
<div>
|
||||
<label>What you did:</label><br/>
|
||||
<textarea id="remark" rows="6" ></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div><br/>
|
||||
</t>
|
||||
<div class="oe_error_detail">
|
||||
<pre><t t-esc="error.message"/></pre>
|
||||
<hr/>
|
||||
|
|
|
@ -39,5 +39,4 @@ class TestSession(Session):
|
|||
"context": CONTEXT,
|
||||
"db": req.session._db,
|
||||
"login": req.session._login,
|
||||
"openerp_entreprise": False,
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue