-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 | |||
@@ -279,7 +279,6 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, { | |||
279 | if (this.shouldProcessData()) { | 279 | if (this.shouldProcessData()) { |
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 | ||
285 | if (typeof(someValues['data']['notes']) != 'undefined') { | 284 | if (typeof(someValues['data']['notes']) != 'undefined') { |
@@ -292,16 +291,16 @@ console.log("Record.processData", someValues); | |||
292 | this.setCurrentVersionKey(this.key()); | 291 | this.setCurrentVersionKey(this.key()); |
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']; |
299 | } else { | 297 | } else { |
300 | currentVersionParameters = someValues['versions'][someValues['currentVersion']]; | 298 | currentVersionParameters = someValues['versions'][someValues['currentVersion']]; |
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)); |
307 | 306 | ||
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 | |||
@@ -508,7 +508,7 @@ Clipperz.PM.Strings.Languages['en-us'] = { | |||
508 | <li><p>Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.</p></li>\ | 508 | <li><p>Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.</p></li>\ |
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>\ |
514 | </ol>\ | 514 | </ol>\ |
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 | |||
@@ -13,7 +13,6 @@ def repositoryWithPath (path): | |||
13 | from git import Repo | 13 | from git import Repo |
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" |
19 | raise exception | 18 | raise exception |
@@ -89,9 +88,12 @@ class HgRepository(Repository): | |||
89 | 88 | ||
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 |