From 67ba4cd7b5bc5e834db3106b3081677ee70d18f7 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 18 Mar 2012 21:30:36 -0400 Subject: [PATCH 1/5] add code to handle older version of GitPython --- scripts/builder/repository.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index 0045de7..a47e249 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py @@ -56,11 +56,18 @@ class GitRepository(Repository): # http://gitorious.org/git-python def revision (self): - return self.repository.head.commit.hexsha + try: + return self.repository.head.commit.hexsha + except: + return self.repository.commits()[0].id def areTherePendingChanges (self): - return self.repository.is_dirty() + try: + return self.repository.is_dirty() + except TypeError, te: + return self.repository.is_dirty + #=================================================================== From 36b3236415b856ddd0ad2804e82e410b5240ff4f Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 15 Jun 2012 21:26:30 -0400 Subject: [PATCH 2/5] fix the cancel button for editing cards The javascript was checking for the parameters assuming the backend provided version information. The community edition backend does not supply any versioning information so the javascript checks both locations --- frontend/beta/js/Clipperz/PM/DataModel/Record.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js index ffb45de..9e496de 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js @@ -292,8 +292,14 @@ console.log("Record.processData", someValues); this.setCurrentVersionKey(this.key()); } -// currentVersionParameters = someValues['currentVersion']; - currentVersionParameters = someValues['versions'][someValues['currentVersion']]; +// community edition doesn't currently pass version +// information + if (someValues['versions'] == null) { + currentVersionParameters = someValues['currentVersion']; + } else { + currentVersionParameters = someValues['versions'][someValues['currentVersion']]; + } + console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); console.log("Record.processData - currentVersionParameters", currentVersionParameters); currentVersionParameters['key'] = this.currentVersionKey(); From 7bf1c8f74de6f83bd08b95884fa7a90a716ce308 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 15 Jun 2012 21:46:56 -0400 Subject: [PATCH 3/5] Fix the Clipperz Compact link The clipperz compact link should be relative to the current path --- frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9fa95e9..299ebc7 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'] = {

  • Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.

    • \
  • \

    Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.

    \ - \ + \
    • \

  • Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.

    • \ \ From 052d05310292c62876295ab8623496788b893f4b Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 15 Jun 2012 22:41:01 -0400 Subject: [PATCH 4/5] Remove reference to missing images This removes references to image files that are missing that don't affect the display. --- frontend/beta/css/yui-extensions/basic-dialog.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css index bad0679..5a9f311 100644 --- a/frontend/beta/css/yui-extensions/basic-dialog.css +++ b/frontend/beta/css/yui-extensions/basic-dialog.css @@ -24,7 +24,6 @@ refer to http://www.clipperz.com. */ .ydlg-proxy { - background-image: url(../images/default/gradient-bg.gif); background-color:#c3daf9; border:1px solid #6593cf; z-index:10001; @@ -93,7 +92,6 @@ body.masked .ydlg select { padding-right:3px; } .ydlg .ydlg-dlg-body{ - background:url(../images/default/layout/gradient-bg.gif); border:1px solid #6593cf; border-top:0 none; padding:10px; From 28bcbca9846755746541a516f21fe661445a2bae Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 19 Jun 2012 12:04:50 -0400 Subject: [PATCH 5/5] Add a fall-back repository class for SNAPSHOTS Create a new SnapshotRepository class that returns SNAPSHOT as the version Should let you build if there are any problems with your git repo --- scripts/builder/repository.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index a47e249..7ac2324 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py @@ -11,12 +11,14 @@ def repositoryWithPath (path): except: try: from git import Repo - repo = Repo(path) result = GitRepository(repo, path) + except ImportError, exception: print "Failed to import git, please install http://gitorious.org/git-python" raise exception + except: + result = SnapshotRepository('', path) return result @@ -86,3 +88,10 @@ class HgRepository(Repository): #=================================================================== + +class SnapshotRepository(Repository): + def revision (self): + return 'SNAPSHOT' + + def areTherePendingChanges (self): + return False