Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMS fixes required to upgrade backbonejs

Browse Source
This commit is contained in:
Ehtesham
2016-04-15 18:51:57 +05:00
committed by muzaffaryousaf
parent a1cb7b8f39
commit 59e1cafc02
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/static/js/views/baseview.js
View File

@@ -26,6 +26,14 @@ define(["jquery", "underscore", "backbone", "gettext", "js/utils/handle_iframe_b
//override the constructor function
constructor: function(options) {
_.bindAll(this, 'beforeRender', 'render', 'afterRender');
// Merge passed options and view's options property and
// attach to the view's options property
if (this.options) {
options = _.extend({}, _.result(this, 'options'), options);
}
this.options = options;
var _this = this;
this.render = _.wrap(this.render, function (render, options) {
_this.beforeRender();

4
cms/static/js/views/manage_users_and_roles.js
View File

@@ -100,8 +100,8 @@ define(['jquery', 'underscore', 'gettext', "js/views/baseview",
};
var roleEvents = {};
var self = this;
for (var i = 0; i < self.roles.length; i++) {
var role_name = self.roles[i].key;
for (var i = 0; i < self.options.roles.length; i++) {
var role_name = self.options.roles[i].key;
var role_selector = 'click .user-actions .make-' + role_name;
(function (role) {