scip/digiproof
1
0
Fork 0
mirror of https://codeberg.org/scip/digiproof.git synced 2025-12-17 04:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed the build process it generates a devel and a prod version

Browse Source 
of the source, added some screenshots and a sample printout, couple
bugfixes.
This commit is contained in:
git@daemon.de
2013-09-14 13:14:06 +02:00
parent 81aa7e83e4
commit 10e5d547f3
25 changed files with 56118 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/controllers_data.js
View File

@@ -126,6 +126,7 @@ App.UploadFileView = Ember.TextField.extend({
App.DataImportController = Ember.ObjectController.extend({
isEditing: true,
clear: '',
failed: false,
errors: {},
doneEditing: function() {
@@ -197,6 +198,15 @@ App.DataImportController = Ember.ObjectController.extend({
// suck it in
ImportJSON(importobj, pass);
this.set('clear', translate('_importdone'));
var isuccessors = [];
$.each(importobj.successors, function(index, obj) {
if(obj.id != '0') {
isuccessors.pushObject(obj);
}
});
this.set('successors', isuccessors);
this.set('assets', importobj.assets);
this.set('self', importobj.self);
}
else {
throw 'decrypted variable $json doesnt contain anything, weird';
@@ -205,12 +215,14 @@ App.DataImportController = Ember.ObjectController.extend({
catch (e) {
// console.log("decryption exception: %o", e);
this.set('clear', translate('_error_decrypt') + " (" + e + ")");
this.set('failed', true);
}
}
else {
// no password given
this.set('isEditing', true);
this.set('errors', validated);
this.set('failed', true);
this.set('clear', translate('_error_decrypt'));
}
},