Skip to content

Commit

Permalink
Merge pull request #169 from OnroerendErfgoed/edit_labels_bug
Browse files Browse the repository at this point in the history 
Edit labels bug
  • Loading branch information
Cedrik Vanderhaegen committed Feb 10, 2015
2 parents 0121447 + bf8b881 commit 52f589a
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 71 deletions.
20 changes: 2 additions & 18 deletions atramhasis/static/admin/src/app/form/ConceptDetailList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ define([
return item.type == typevalue;
});
return arrayUtil.map(filteredItems, function (item) {
return {label: item.label, language: self._getLanguageToDisplay(item.language), languageValue: item.language, type: typeToBeDisplayed, typeValue: item.type};
return {label: item.label, language: item.language, languageValue: item.language, type: typeToBeDisplayed, typeValue: item.type};
});
},
_mapNoteToDisplayInGrid: function (notes, typevalue, typeToBeDisplayed) {
Expand All @@ -143,25 +143,9 @@ define([
});

return arrayUtil.map(filteredItems, function (item) {
return {label: item.note, language: self._getLanguageToDisplay(item.language), languageValue: item.language, type: typeToBeDisplayed, typeValue: item.type};
return {label: item.note, language: item.language, languageValue: item.language, type: typeToBeDisplayed, typeValue: item.type};
});
},
_getLanguageToDisplay: function (language) {
switch (language) {
case "nl":
return "NL";
break;
case "fr":
return "FR";
break;
case "en":
return "EN";
break;
default:
return language;
break;
}
},

reset: function () {

Expand Down
73 changes: 38 additions & 35 deletions atramhasis/static/admin/src/app/form/LabelManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,35 +204,54 @@ define([

_createGrid: function (gridDiv) {
var self = this;

var gridStore = new Memory({
data: []
});

var columns;
columns = [
{label: "Title", field: "label"},
{label: "Language", field: "language"},
{label: "Language", field: "languageValue", unhidable: true, hidden: true},
{label: "Type", field: "typeDisplayed"},
{label: "Type", field: "type", unhidable: true, hidden: true},
editor({label: " ", field: 'button',
editorArgs: {label: "delete", showLabel: false, iconClass: 'minIcon', onClick: function (event) {

var row = grid.row(event);
self.languageComboBox.getOptions(row.data.languageValue).disabled=false;
var itemToDelete = row.data.id;
grid.store.remove(itemToDelete);
grid.resize();
grid.refresh();
// self._checkPrefLabelRules(row.data.type);
}
}},
Button)
{
label: ' ',
field: 'complexCell',
renderCell: function (object, value, node, options) {
return new Button({
label: "remove",
onClick: function () {
//re-add fitlered data, removing items directly is not possible without id's
grid.store.data = arrayUtil.filter(grid.store.data, function (item) {
return !(object.label == item.label
&& object.language == item.language
&& object.type == item.type)
});
grid.refresh();
}
}).domNode;
}
}
// editor({label: " ", field: 'button',
// editorArgs: {label: "delete", showLabel: false, iconClass: 'minIcon', onClick: function (event) {
// console.log('deleting ', event, grid.row(event));
// var row = grid.row(event);
// self.languageComboBox.getOptions(row.data.languageValue).disabled=false;
// var itemToDelete = row.data.id;
// grid.store.remove(itemToDelete);
// grid.resize();
// grid.refresh();
// // self._checkPrefLabelRules(row.data.type);
// }
// }},
// Button)
];
var gridStore = new Memory({
data: []

});
var grid = new (declare([OnDemandGrid, ColumnHider]))({
columns: columns,
store: gridStore,
selectionMode: "single" // for Selection; only select a single row at a time
store: gridStore
}, gridDiv);

grid.startup();
Expand Down Expand Up @@ -261,25 +280,9 @@ define([
return item.type == typevalue;
});
return arrayUtil.map(filteredItems, function (item) {
return {label: item.label, language: self._getLanguageToDisplay(item.language), languageValue: item.language, type: item.type, typeDisplayed: typeToBeDisplayed};
return {label: item.label, language: item.language, languageValue: item.language, type: item.type, typeDisplayed: typeToBeDisplayed};
});
},
_getLanguageToDisplay: function (language) {
switch (language) {
case "nl":
return "NL";
break;
case "fr":
return "FR";
break;
case "en":
return "EN";
break;
default:
return language;
break;
}
},

//not in use for the moment
_checkPrefLabelRules: function (value) {
Expand Down
19 changes: 1 addition & 18 deletions atramhasis/static/admin/src/app/form/NoteManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,26 +280,9 @@ define([
});

return arrayUtil.map(filteredItems, function (item) {
return {label: item.note, language: self._getLanguageToDisplay(item.language), languageValue: item.language, type:item.type , typeDisplayed:typeToBeDisplayed};
return {label: item.note, language: item.language, languageValue: item.language, type:item.type , typeDisplayed:typeToBeDisplayed};
});
},
_getLanguageToDisplay: function (language) {
switch (language) {
case "nl":
return "NL";
break;
case "fr":
return "FR";
break;
case "en":
return "EN";
break;
default:
return language;
break;
}

},

geNotes: function () {
if(this.noteGrid) {
Expand Down

0 comments on commit 52f589a

Please sign in to comment.