Merge branch 'PR-50'

remotes/origin/PR-58
booblegum 9 years ago
commit 7c6353fce3
  1. 1
      assets/js/build/init_create_worksell.js
  2. 3
      assets/js/build/init_customer_project_create.js
  3. 2
      assets/js/src/init_customer_project_create.js
  4. 2
      assets/lib/proekton-components/js/src/SelectOrCreate.js

@ -1783,6 +1783,7 @@
this.$buttonCreate.on("click", this._onButtonCreate.bind(self)); this.$buttonCreate.on("click", this._onButtonCreate.bind(self));
this._fillOptionsData(); this._fillOptionsData();
this._bindEvents(); this._bindEvents();
this.$searchInput.attr("placeholder", 'Создать/Выбрать объект');
} }
}, { }, {
key: 'getData', key: 'getData',

@ -175,7 +175,7 @@
sb_realty_top.hide(); sb_realty_top.hide();
} else { } else {
var id = window.location.hash.replace("#", ""); var id = window.location.hash.replace("#", "");
sb_realty_top.setElementById(id); if (id) sb_realty_top.setElementById(id);
} }
}); });
select_realty.on("add", function (args) { select_realty.on("add", function (args) {
@ -1823,6 +1823,7 @@
this.$buttonCreate.on("click", this._onButtonCreate.bind(self)); this.$buttonCreate.on("click", this._onButtonCreate.bind(self));
this._fillOptionsData(); this._fillOptionsData();
this._bindEvents(); this._bindEvents();
this.$searchInput.attr("placeholder", 'Создать/Выбрать объект');
} }
}, { }, {
key: 'getData', key: 'getData',

@ -114,7 +114,7 @@ $(function () {
sb_realty_top.hide() sb_realty_top.hide()
}else{ }else{
let id = window.location.hash.replace("#", ""); let id = window.location.hash.replace("#", "");
sb_realty_top.setElementById(id); if (id) sb_realty_top.setElementById(id);
} }
}); });
select_realty.on("add", (args)=> { select_realty.on("add", (args)=> {

@ -44,7 +44,6 @@ export default class SelectOrCreate extends AbsBaseSelect {
setLinkBoxes(boxes = []) { setLinkBoxes(boxes = []) {
this.boxes = boxes; this.boxes = boxes;
} }
_buildComponents(data) { _buildComponents(data) {
super._buildComponents(data); super._buildComponents(data);
const self = this; const self = this;
@ -58,6 +57,7 @@ export default class SelectOrCreate extends AbsBaseSelect {
this.$buttonCreate.on("click", this._onButtonCreate.bind(self)); this.$buttonCreate.on("click", this._onButtonCreate.bind(self));
this._fillOptionsData(); this._fillOptionsData();
this._bindEvents(); this._bindEvents();
this.$searchInput.attr("placeholder", 'Создать/Выбрать объект')
} }
getData(url, data = {}) { getData(url, data = {}) {

Loading…
Cancel
Save