-rw-r--r-- | frontend/beta/js/Clipperz/PM/DataModel/Record.js | 9 | ||||
-rw-r--r-- | frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | 2 | ||||
-rw-r--r-- | scripts/builder/repository.py | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js index d6ebb39..f89f79c 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js | |||
@@ -280,5 +280,4 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, { | |||
280 | var currentVersionParameters; | 280 | var currentVersionParameters; |
281 | 281 | ||
282 | console.log("Record.processData", someValues); | ||
283 | this.processDataToExtractLegacyValues(someValues['data']); | 282 | this.processDataToExtractLegacyValues(someValues['data']); |
284 | 283 | ||
@@ -293,6 +292,5 @@ console.log("Record.processData", someValues); | |||
293 | } | 292 | } |
294 | 293 | ||
295 | // community edition doesn't currently pass version | 294 | // community edition doesn't currently pass version information |
296 | // information | ||
297 | if (someValues['versions'] == null) { | 295 | if (someValues['versions'] == null) { |
298 | currentVersionParameters = someValues['currentVersion']; | 296 | currentVersionParameters = someValues['currentVersion']; |
@@ -301,6 +299,7 @@ console.log("Record.processData", someValues); | |||
301 | } | 299 | } |
302 | 300 | ||
303 | console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); | 301 | //- currentVersionParameters = someValues['currentVersion']; |
304 | console.log("Record.processData - currentVersionParameters", currentVersionParameters); | 302 | // currentVersionParameters = someValues['versions'][someValues['currentVersion']]; |
303 | |||
305 | currentVersionParameters['key'] = this.currentVersionKey(); | 304 | currentVersionParameters['key'] = this.currentVersionKey(); |
306 | this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); | 305 | this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); |
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js index 299ebc7..ab1bb0f 100644 --- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js +++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | |||
@@ -509,5 +509,5 @@ Clipperz.PM.Strings.Languages['en-us'] = { | |||
509 | <li>\ | 509 | <li>\ |
510 | <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\ | 510 | <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\ |
511 | <div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\ | 511 | <div id=\"compactLinkBox\"><a href=\"./index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\ |
512 | </li>\ | 512 | </li>\ |
513 | <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\ | 513 | <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\ |
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index 7ac2324..7a44e47 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py | |||
@@ -14,5 +14,4 @@ def repositoryWithPath (path): | |||
14 | repo = Repo(path) | 14 | repo = Repo(path) |
15 | result = GitRepository(repo, path) | 15 | result = GitRepository(repo, path) |
16 | |||
17 | except ImportError, exception: | 16 | except ImportError, exception: |
18 | print "Failed to import git, please install http://gitorious.org/git-python" | 17 | print "Failed to import git, please install http://gitorious.org/git-python" |
@@ -90,8 +89,11 @@ class HgRepository(Repository): | |||
90 | #=================================================================== | 89 | #=================================================================== |
91 | 90 | ||
91 | |||
92 | class SnapshotRepository(Repository): | 92 | class SnapshotRepository(Repository): |
93 | |||
93 | def revision (self): | 94 | def revision (self): |
94 | return 'SNAPSHOT' | 95 | return 'SNAPSHOT' |
95 | 96 | ||
97 | |||
96 | def areTherePendingChanges (self): | 98 | def areTherePendingChanges (self): |
97 | return False | 99 | return False |