From c076311799f86d0719440aaee80377f6a2a31132 Mon Sep 17 00:00:00 2001 From: yackob03 Date: Thu, 7 Nov 2013 23:29:36 -0500 Subject: [PATCH 1/4] Fix the icon to remove a team from a repo. --- static/partials/repo-admin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html index c23e01121..ecf6b177a 100644 --- a/static/partials/repo-admin.html +++ b/static/partials/repo-admin.html @@ -47,7 +47,7 @@ - + From 393534bfb4538159866dcd76ab7a6656fb8b10bd Mon Sep 17 00:00:00 2001 From: yackob03 Date: Thu, 7 Nov 2013 23:29:58 -0500 Subject: [PATCH 2/4] Add an outside user to the orgrepo for the purpose of screenshots. --- initdb.py | 7 ++++++- test/data/test.db | Bin 96256 -> 96256 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/initdb.py b/initdb.py index cfc2f40f5..aebdbe684 100644 --- a/initdb.py +++ b/initdb.py @@ -144,6 +144,10 @@ def populate_database(): reader.verified = True reader.save() + outside_org = model.create_user('outsideorg', 'password', 'no2@thanks.com') + outside_org.verified = True + outside_org.save() + __generate_repository(new_user_1, 'simple', 'Simple repository.', False, [], (4, [], ['latest', 'prod'])) @@ -189,7 +193,8 @@ def populate_database(): org_repo = __generate_repository(org, 'orgrepo', 'Repository owned by an org.', False, - [], (4, [], ['latest', 'prod'])) + [(outside_org, 'read')], + (4, [], ['latest', 'prod'])) reader_team = model.create_team('readers', org, 'member', 'Readers of orgrepo.') diff --git a/test/data/test.db b/test/data/test.db index fc7db0002ddbdcec704797db76b9be8d9f2d0c22..20ed3819d36d71d54cdf20cd477623d14002ea5f 100644 GIT binary patch delta 1101 zcmbu7?{5=z9LMkaxx22^4K!#5F439sU{Sieu6Mn5Mrm)erR#dG>-Co*v%l!A+pe^| ztu2OF{{!@!_zV-3K-4F=BOxR#vX~J8p$rr?Q;AN+xDqECG0{Z7>mI;!pM4*^-tW)n z^L~FD8+2oXKKeKrdA&y>BOkte+_{4x*9kZVqG{FCF!hq_#>3PXq{+dcpxZHdfVL35 zuhIP$qN6ycSEjPLVmaSuPxW#3z85mia5kIq@g;BEk*_O(QbbA1UXSW44o;7b9m*s< zvXre>I6e_mW|e{3*nD_OE86$zYD$}~*fPag)Npt6=>gWOl%!BqiEDLz*tUO0)l<3r z;X*y2Me}Stl=CGb`QcJ@JYG^OLM<0Kn6RNM?tXqwEQkq3Q}Vv~N>xnQ>)Ap)DW@xP zM)V7c5Pebe@FPxcwj4{jW>S*o9}paM^z_gkp7m%-QfF)F*=c80J*et~#X?+GYr2PL zYwSoi>f!3v67+HA`S;5F6pqswO zXp9gfYWcb`bA*7)*x&>pI15KGGX?1A=%d@2N1&g)-;43~Xva>HLGMpKMKZ>f$!91t zW1@hxFbmnc+q)Q(mD)vGid8LFt}qMwap@&jJTejSj`)*GP#X7(K3BxcDvX`w2KRE@Ue@`feb8-pxmm%+@lHYH zjDOE8!M^`HVBs9qv)c-YfWP2Z_yLE%0-wMlEWms479bqO9PG4M8G?4c}ww*YF$M#91z5;YmOnuTUniqRY2jTj+ATtrmO-*D&}Kp7uFh zYNOjW+pyBG>D*l7F@Ap2`A^t@U+`Mr!k2IzK7|W#9^>z9Ih(EM!tLiUdhx-E*D(AQ zdoZ>l}sg(**pD|Jfb9z%A^%0+--pI0vUO{w8#qDSV#EY-K2X rCtCVl!irM_oN8-+#MgZUE%*km;$6;Q#T(GsCe7BikTw?YNsa#i@)TJH delta 897 zcmbu--A`L(90%}o`aK6y4CoTK6eW?Ecwv-7PkT;Zz(m_q+R|6rl@@9YD{G;&<-MiC zGHv_|Fwd>vg{YAmwY?BCb%KT%J3ux^W^h~PREU(wm>Em9L?7USKfvqnC%^CW{GO+< z#~1ea>1Wx%yA28(`25_Qv5r@{7|g(=+Ef)(uF@&aq*6&d*)>a~(4vtu)}VVL*_-Y( zcsrV>2BlPXax|I{vZINZFX$Z6ORX=+!B9Lfmd>P{ zS&MxjB+A~{kiK6?b+omoyW1swzs=%`$HT@@bV?lR60L0+bG~_ithqI0ru7+la8%o! zviZ%5*%TN_OeluFP%bNEQ>i}DnRgCE^5Y{`!5gyr3~9M7C`FQT#xO}Lt(qDhOAMCq z4>n6rz48G_BX_E{7SFN0xyhkSY^*;))?StCcx*Fxj05ar7u$4U8vqA2*-`3gwsDee z(CmAVb;lV}acF2Z&7h2Je1tDCO|!Q^F1k;bK6Gf!uQVr-l*X6KaGJ)MeE>j~I=ZHnDyF`l&tBVM1iJz_8hb(UzmB^t1Y zP5us-!>-fY{6?!g>`~0Vh|}-(+am#2uu7*D^-ZGKq%}6`bS;v;MU(_d)|-r`(!XCU z;w8bxjq+GAyeiA8)=vZTWa@6>Q-* zs(-~jY@kf-ryzS5II?zIK33(U)mLx_KT-21oqhdCaU2+ytld3i%ZI}rU=M%M@>{rp ztGI$?%H~17-Qr1k%S_ek$xChHE_J`)XRK0Hq?K>;rE5DPN7*F?kLZ`!rCqn_sCE2^ u?{JB-_fb{Nv4>Y!ysuEWz+mBs{y~p^85P{b>QU=^AfFvnmA*N!7XAZ<&MB+_ From 5fe1a6806ea13d95bfba2155c2b4408732a78436 Mon Sep 17 00:00:00 2001 From: yackob03 Date: Thu, 7 Nov 2013 23:35:20 -0500 Subject: [PATCH 3/4] Fix the team results for the entities query. --- data/model.py | 2 +- endpoints/api.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/model.py b/data/model.py index 80cdde416..4f44d863d 100644 --- a/data/model.py +++ b/data/model.py @@ -299,7 +299,7 @@ def get_user(username): def get_matching_teams(team_prefix, organization): query = Team.select().where(Team.name ** (team_prefix + '%'), Team.organization == organization) - return list(query.limit(10)) + return query.limit(10) def get_matching_users(username_prefix, organization=None): diff --git a/endpoints/api.py b/endpoints/api.py index f167c3e5f..309166d7c 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -273,6 +273,7 @@ def get_matching_entities(prefix): 'kind': 'team', 'is_org_member': True } + return result def user_view(user): user_json = { From 30ca5a272babb2ea9426f6e5bbbf0c71b4713e70 Mon Sep 17 00:00:00 2001 From: yackob03 Date: Thu, 7 Nov 2013 23:36:16 -0500 Subject: [PATCH 4/4] Add a screenshot for the repo admin of an org repo. --- screenshots/screenshots.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/screenshots/screenshots.js b/screenshots/screenshots.js index 09a817ed4..914192216 100644 --- a/screenshots/screenshots.js +++ b/screenshots/screenshots.js @@ -30,6 +30,7 @@ var isDebug = !!options['d']; var rootUrl = isDebug ? 'http://localhost:5000/' : 'https://quay.io/'; var repo = isDebug ? 'complex' : 'r0'; var org = isDebug ? 'buynlarge' : 'quay' +var orgrepo = 'orgrepo' var outputDir = "screenshots/"; @@ -123,4 +124,14 @@ casper.then(function() { this.capture(outputDir + 'org-admin.png'); }); +casper.thenOpen(rootUrl + 'repository/' + org + '/' + orgrepo + '/admin', function() { + this.waitForText('outsideorg') +}); + +disableOlark(); + +casper.then(function() { + this.capture(outputDir + 'org-repo-admin.png'); +}); + casper.run();