1 files changed, 10 insertions, 34 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/Record.js b/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
index b816f80..3fc1813 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
@@ -1,44 +1,41 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 
 Clipperz.PM.DataModel.Record = function(args) {
-//console.log(">>> new Clipperz.PM.DataModel.Record", args);
         Clipperz.PM.DataModel.Record.superclass.constructor.apply(this, arguments);
 
                 this._updateDate                        = (args.updateDate ? Clipperz.PM.Date.parse(args.updateDate) : Clipperz.Base.exception.raise('MandatoryParameter'));
 
                 this._retrieveIndexDataFunction         = args.retrieveIndexDataFunction|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._updateIndexDataFunction   = args.updateIndexDataFunction  || Clipperz.Base.exception.raise('MandatoryParameter');
 
                 this._retrieveDirectLoginIndexDataFunction      = args.retrieveDirectLoginIndexDataFunction|| null;
                 this._setDirectLoginIndexDataFunction           = args.setDirectLoginIndexDataFunction  || null;
                 this._removeDirectLoginIndexDataFunction        = args.removeDirectLoginIndexDataFunction|| null;
 
                 this._createNewDirectLoginFunction                      = args.createNewDirectLoginFunction             || null;
@@ -53,26 +50,24 @@ Clipperz.PM.DataModel.Record = function(args) {
 
                 this.setNotes('');
                 newVersion = new Clipperz.PM.DataModel.Record.Version({
                                 'retrieveKeyFunction':MochiKit.Base.method(this, 'getVersionKey'),
                                 'getVersion':           MochiKit.Base.method(this, 'getVersion')
 
                 });
                 this._versions[newVersion.reference()] = newVersion;
                 this._currentVersionReference = newVersion.reference();
         //      this.setLabel('');
         }
 
-//console.log("<<< new Clipperz.PM.DataModel.Record", args);
-
         return this;
 }
 
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.EncryptedRemoteObject, {
 
         'toString': function() {
                 return "Record (" + this.reference() + ")";
         },
 
         //-------------------------------------------------------------------------
 
@@ -201,39 +196,37 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                 } else {
                                 result = null; //MochiKit.Async.succeed(Clipperz.PM.Strings['defaultFaviconUrl']);
                 }
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'searchableContent': function () {
                 var deferredResult;
 
-//console.log(">>> searchableContent");
                 deferredResult = new Clipperz.Async.Deferred("Record.searchableContent", {trace:false});
                 
                 deferredResult.collectResults({
                         'recordLabel': MochiKit.Base.method(this, 'label'),
                         'directLoginLabels': [
                                 MochiKit.Base.method(this, 'directLoginReferences'),
                                 MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.itemgetter('label'))
                         ]
                 })
                 deferredResult.addCallback(function (someValues) {
                         return someValues['recordLabel'] + ' ' + someValues['directLoginLabels'].join(' ');
                 });
                 deferredResult.callback();
-//console.log("<<< searchableContent");
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'isMatching': function (aRegExp) {
                 return Clipperz.Async.callbacks("deferredFilterFunction", [
                         MochiKit.Base.method(this, 'searchableContent'),
                         MochiKit.Base.method(aRegExp, 'test'),
                         function (doesItMatch) {
                                 var result;
@@ -261,25 +254,24 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
 
         'directLoginWithReference': function (aDirectLoginReference) {
                 return this._directLogins[aDirectLoginReference];
         },
 
         'createNewDirectLoginFunction': function () {
                 return this._createNewDirectLoginFunction;
         },
 
         'saveOriginalDirectLoginStatusToTransientState': function () {
                 if (this.transientState().getValue('directLogins') == null) {
         //              this.transientState().setValue('directLogins', this._directLogins)
-//console.log("SET TRANSIENT STATE", Clipperz.Base.serializeJSON(MochiKit.Base.keys(this.transientState().getValue('directLogins'))))
                         MochiKit.Iter.forEach(MochiKit.Base.keys(this._directLogins), MochiKit.Base.bind(function(aKey) {
                                 this.transientState().setValue('directLogins' + '.' + aKey, this._directLogins[aKey])
                         }, this))
                 }
         },
         
         'createNewDirectLogin': function () {
                 this.saveOriginalDirectLoginStatusToTransientState();
 
                 return this.createNewDirectLoginFunction()(this);
         },
 
@@ -320,47 +312,44 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                         },
                         Clipperz.Async.collectAll
                 ], {trace:false});
                 
                 return result;
         },
 
         //=========================================================================
 
         'unpackRemoteData': function (someData) {
                 var result;
 
-//console.log("new Clipperz.PM.DataModel.Record.Version [2]");
 /*
                 this._currentRecordVersion = new Clipperz.PM.DataModel.Record.Version({
                                 'reference':                    someData['currentVersion']['reference'],
                                 'retrieveKeyFunction':  MochiKit.Base.method(this, 'getCurrentRecordVersionKey'),
                                 'remoteData':                   someData['currentVersion'],
                 });
 */
                 var versionKey;
 
                 for (versionKey in someData['versions']) {
-//console.log("### versionKey", versionKey);
                         this._versions[versionKey] = new Clipperz.PM.DataModel.Record.Version({
                                         'reference':            versionKey,
                                         'retrieveKeyFunction':MochiKit.Base.method(this, 'getVersionKey'),
                                         'remoteData':           someData['versions'][versionKey],
                                         'getVersion':           MochiKit.Base.method(this, 'getVersion')
                         })
                 }
                 
         //      this._currentVersionReference = someData['currentVersion']['reference'];
                 this._currentVersionReference = someData['currentVersion'];
-//console.log("=== currentVersionReference", this._currentVersionReference, someData);
 
                 result = Clipperz.PM.DataModel.Record.superclass.unpackRemoteData.apply(this, arguments);
 
                 return result;
         },
         
         //-------------------------------------------------------------------------
 
         'unpackData': function (someData) {
                 var result;
 
                 result = Clipperz.PM.DataModel.Record.superclass.unpackData.apply(this, arguments);
@@ -527,25 +516,24 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                                 MochiKit.Base.bind(function (someVersions) { return someVersions[this.currentVersionReference()]}, this)
                         ])
                 ], {trace:false});
         },
         
         'setCurrentRecordVersion': function (aRecordVersion) {
                 this._currentVersionReference = aRecordVersion.reference();
         },
 
         //.........................................................................
 
         'currentVersionReference': function () {
-//console.log("currentVersionReference");
                 return this._currentVersionReference;
         },
 
         //-------------------------------------------------------------------------
 
         'createNewRecordVersion': function () {
                 var deferredResult;
                 
                 if (this.isBrandNew()) {
                         deferredResult = this.getCurrentRecordVersion();
                 } else {
                         var newVersion;
@@ -576,98 +564,88 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
 
                                 MochiKit.Base.method(this, 'setCurrentRecordVersion', newVersion),
                                 MochiKit.Base.partial(MochiKit.Async.succeed, newVersion)
                         ], {trace:false});
                 }
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'getCurrentRecordVersionKey': function () {
-//console.log("getCurrentRecordVersionKey");
                 return Clipperz.Async.callbacks("Record.getCurrentRecordVersionKey", [
                         MochiKit.Base.method(this, 'getValue', 'currentVersionKey'),
                         Clipperz.Async.deferredIf("currentVersionKey is NOT null", [
                                 MochiKit.Async.succeed
                         ], [
                                 MochiKit.Base.method(this, 'getKey')
                         ])
                 ], {trace:false});
         },
 
         'setCurrentRecordVersionKey': function (aValue) {
                         //TODO: triple check this method!
                 return Clipperz.Async.callbacks("Record.setCurrentRecordVersionKey", [
                         MochiKit.Base.method(this, 'setValue', 'currentVersionKey', aValue)
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'invokeCurrentRecordVersionMethod': function (aMethodName, someValues) {
-//console.log(">>> invokeCurrentRecordVersionMethod", aMethodName);
                 return Clipperz.Async.callbacks("Record.invokeCurrentRecordVersionMethod", [
                         MochiKit.Base.method(this, 'getCurrentRecordVersion'),
-//function (aValue) { console.log("=== getCurrentRecordVersion", aValue); return aValue},
                         MochiKit.Base.methodcaller(aMethodName, someValues)
                 ], {trace:false});
         },
 
 
         'lazilyinvokeCurrentRecordVersionMethod': function (aMethodName, someValues, defaultResult) {
                 return Clipperz.Async.callbacks("Record.lazilyinvokeCurrentRecordVersionMethod", [
                         MochiKit.Base.method(this, 'currentVersionReference'),
-//function (aValue) { console.log("LAZY -> versions", aValue); return aValue; },
                         Clipperz.Async.deferredIf("versions has been loaded", [
-//function (aValue) { console.log("LAZY -> then"); return aValue; },
                                 MochiKit.Base.method(this, 'getCurrentRecordVersion'),
                                 MochiKit.Base.methodcaller(aMethodName, someValues),
-//function (aValue) { console.log("LAZY <- then"); return aValue; }
                         ], [
-//function (aValue) { console.log("LAZY -> else"); return aValue; },
                                 MochiKit.Base.partial(MochiKit.Async.succeed, defaultResult),
-//function (aValue) { console.log("LAZY <- else"); return aValue; }
                         ])
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'hasPendingChanges': function () {
                 var deferredResult;
 
                 if (this.hasInitiatedObjectDataStore()) {
                         deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.hasPendingChanges", {trace:false});
                         deferredResult.collectResults({
                                 'super': MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.hasPendingChanges, this),
                                 'currentVersion': [
         //                              MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //                              MochiKit.Base.methodcaller('hasPendingChanges')
                                         MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'hasPendingChanges')
                                 ],
                                 'directLogins': [
                                         MochiKit.Base.method(this, 'directLogins'),
-//function (aValue) { console.log("Record.directLogins", aValue); return aValue; },
                                         MochiKit.Base.values,
                                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('hasPendingChanges')),
                                         Clipperz.Async.collectAll,
                                         Clipperz.Async.or
         //                              function(someValues) {
         //                                      return MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
         //                              }
                                 ]
                         });
-//deferredResult.addCallback(function (aValue) { console.log("Record.hasPendingResults", aValue); return aValue; });
                         deferredResult.addCallback(MochiKit.Base.values);
                         deferredResult.addCallback(MochiKit.Base.bind(function(someValues) {
                                 var result;
                                 result = MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
 
                                 if ((result == false) && (this.isBrandNew() == false)) {
                                         result = MochiKit.Iter.some(MochiKit.Base.values(this.transientState().getValue('hasPendingChanges.indexData')), MochiKit.Base.operator.identity);
                                 }
                 
                                 return result;
                         }, this));
 
@@ -767,25 +745,24 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
         'resetTransientState': function (isCommitting) {
         //      if ((isCommitting == false) && (this.transientState().getValue('directLogins') != null)) {
         //              this._directLogins = this.transientState().getValue('directLogins');
         //      }
 
                 return Clipperz.Async.callbacks("Record.resetTransientState", [
         //-             MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //-             MochiKit.Base.methodcaller('resetTransientState'),
         //              MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'resetTransientState'),
                         MochiKit.Base.method(this, 'lazilyinvokeCurrentRecordVersionMethod', 'resetTransientState'),
 
                         MochiKit.Base.method(this, 'directLogins'),
-//function (aValue) { console.log("resetTransientState - directLogins", aValue); return aValue; },
                         MochiKit.Base.values,
                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('resetTransientState')),
 
                         MochiKit.Base.bind(function () {
                                 if ((isCommitting == false) && (this.transientState().getValue('directLogins') != null)) {
                                         this._directLogins = this.transientState().getValue('directLogins');
                                 }
                         }, this),
 
                         MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.resetTransientState, this, isCommitting)
                 ], {trace:false})
         },
@@ -807,25 +784,24 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('commitTransientState'))
                 ], [
                         MochiKit.Async.succeed
                 ]);
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'retrieveDirectLoginIndexDataFunction': function () {
-//console.log("Record.retrieveDirectLoginIndexDataFunction", this._retrieveDirectLoginIndexDataFunction);
                 return this._retrieveDirectLoginIndexDataFunction;
         },
         
         'setDirectLoginIndexDataFunction': function () {
                 return this._setDirectLoginIndexDataFunction;
         },
         
         'removeDirectLoginIndexDataFunction': function () {
                 return this._removeDirectLoginIndexDataFunction;
         },
 
         //=========================================================================