From b91f9125db2aea1784bd3c1101591b72b42db245 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Tue, 21 Jan 2014 18:39:42 -0500 Subject: [PATCH] Fix logs for organization-wide default permissions --- static/js/app.js | 19 +++++++++++++------ test/data/test.db | Bin 376832 -> 376832 bytes 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/static/js/app.js b/static/js/app.js index 6d8307f4b..022b9f852 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -1195,6 +1195,13 @@ quayApp.directive('logsView', function () { $scope.logStartDate = new Date(datetime.getUTCFullYear(), datetime.getUTCMonth(), datetime.getUTCDate() - 7); $scope.logEndDate = new Date(datetime.getUTCFullYear(), datetime.getUTCMonth(), datetime.getUTCDate()); + var defaultPermSuffix = function(metadata) { + if (metadata.activating_username) { + return ', when creating user is {activating_username}'; + } + return ''; + }; + var logDescriptions = { 'account_change_plan': 'Change plan', 'account_change_cc': 'Update credit card', @@ -1248,23 +1255,23 @@ quayApp.directive('logsView', function () { 'org_set_team_role': 'Change permission of team {team} to {role}', 'create_prototype_permission': function(metadata) { if (metadata.delegate_user) { - return 'Create default permission: {role} for {delegate_user}, when creating user is {activating_username}'; + return 'Create default permission: {role} for {delegate_user}' + defaultPermSuffix(metadata); } else if (metadata.delegate_team) { - return 'Create default permission: {role} for {delegate_team}, when creating user is {activating_username}'; + return 'Create default permission: {role} for {delegate_team}' + defaultPermSuffix(metadata); } }, 'modify_prototype_permission': function(metadata) { if (metadata.delegate_user) { - return 'Modify default permission: {role} (from {original_role}) for {delegate_user}, when creating user is {activating_username}'; + return 'Modify default permission: {role} (from {original_role}) for {delegate_user}' + defaultPermSuffix(metadata); } else if (metadata.delegate_team) { - return 'Modify default permission: {role} (from {original_role}) for {delegate_team}, when creating user is {activating_username}'; + return 'Modify default permission: {role} (from {original_role}) for {delegate_team}' + defaultPermSuffix(metadata); } }, 'delete_prototype_permission': function(metadata) { if (metadata.delegate_user) { - return 'Delete default permission: {role} for {delegate_user}, when creating user is {activating_username}'; + return 'Delete default permission: {role} for {delegate_user}' + defaultPermSuffix(metadata); } else if (metadata.delegate_team) { - return 'Delete default permission: {role} for {delegate_team}, when creating user is {activating_username}'; + return 'Delete default permission: {role} for {delegate_team}' + defaultPermSuffix(metadata); } } }; diff --git a/test/data/test.db b/test/data/test.db index b062c877add6f1d98ebd207985dac5e680fff685..5a73002751e45fbf12f4233721dc4d2d1927e43f 100644 GIT binary patch delta 2917 zcmd6mYfu~48HQQu9PZKr2HOz8ga#W7EA6gU+Fe=10ZVlh{riH*He)9xO&!8dzPe&a$N4R3)fV zit(zu@~SK4DmoF5q1QAJ(>zYVA9kLu874QsW~# zv`=XlwIk$i(xe&JT-7#c%jSfd0?iZtLavWpD4vWFk zWp-Fyf{d55>|U+g0-Yy z{(OURD&70Lqf&jX zgbThB@w}hNt5Lr~rsV%voJ6lb2eW5XcRHWS2IcAUzTR}*`8OWG{4BBk`iy}$m^hPQ zqzopbNO6*Zp#)ltQmi0Gqk<%fagI@|^s3w}q9;!dCWmJvA;Ov>6dg6O6eo%_6=B#I zWr{L1XN>b~JSM5sdSa=8$Rcv2xO@~57>YL<1&X6%5*6X-I3cG-Ntr0o240!q8W;1Y8au}AU3nKj^jnzMC0qH)n~}IJN?4^S#|ffwJX*} zS~Q3>iZlUN=Gli7s7Evf0Q$HIG-gt{qXG#O=*R?eTLXHD0+qJ_*37dd7ncq+WrC%T zzn}xUOt7c}eVJ#nOBou_12z*J*MpXfGkif07Vew5`ThmfYBO=GoJ|)KvU|=~Im6#r`!deH37ax8ygddtVdF}-jn*x@t8dL$u&PRJ&RYqF`Ct1Ao<9us z6Cmq@feZNX6JQkqTI)YPf}ej9kOVMXf>Y>38vGip`cBt)a)m4?lDk8fKBg}oWa%4DE5u%+G5N+3-0~J|Lu5)xgWj_np)20 zv^u(?Mimb$CQ3wd2|4VL#qRWvf2G4`q!>Y@QT#dOn zEF=KDOjxj0g4G15yHc$}(q{MvQ1_$K2Gl+X-vS#|%|%!{1hsNZpVnVNHN)^Tpz3Ro zFgXHO6QKI|LM?7cz;Z%e(e_i+F$&)W4Mn6L-8BY(2^!(=-p3z}L3u}&Uj&cfe~-gG z1ki1Bad>wMt|h?wFJBCxV-s>y>7wu}G&u?10N;Ed9#JN2##2+UfB+TSE+1Xe=+!N7 z5$K-&*`Z~8ZmV*EwRgYvprU!aal7*K!lJ=CMRRC$hkSvOKd%~7B!h;h<#dF)=ld0@ z!+j4zNT?^C*`&xuv~Q;zPEFzaRz=q1qu)`yD>rCPDY_0X>{7fnH6Pxm=-T;N=#*a* z9^a2VyWuIYG4{9$F%QFXy#665zq1m)Ag<`EfPZe^BTBUzJ04LiTaRt4SM(}8@?FJ} zee=v!H2tU?I$N4|5cTenXC^;OUdOeMDWTt8kS;*nUO9BruJRWAjeW3)0BfE-F@yQX z6}zIH|Exsz{c?bXS@1lnIso4U`JT5l_>%*Q`=)!&Hlr^N!Y@J7;HnY)k3+Dr0Thp3 zc?_?61(p#&`@y5VNH_r(Kt=Z3@1lZ}@HEJ;>--4+_N1H+AdC0zM87`;FM)5J8yLpF ac~x1t5G|a;pS%W3h+Oa=a<$&X=>H4gpGOw} delta 3013 zcmd6lX>e258HRnObG%z3*ajPH<2X%YV{5rrcas|rwl-UmWl7eGXrYpICGYYIw$ox8 znz}3rDJnTh2(;sLNvBLn>x@s>N>Z9m!cYuJm$YeVGf7k0)S-}RGMNt0d!0B1jfc#{ zfBNUneb4iq_k8F5&cwv(iHX(Eq^}?h$&3{|+?^N8Gt9WlZ{)fw%H(PG#6WyYROl9l zge`poiJ`>MXrK5e4D@si4t6AZD@s4E=}AO8Vxvpflzdz>lPn#SQN}dot4gf=yYeZ; zv&u5XPDPzkuK1O*U%6jtRy?M-tmslsD%rg2d3zL9c}7KHUVMfx&&hM$BexTu(oNZ7 z%^kWaU96c&st%p5=k%H279p8#v3g@pT|v^9ZsJi6mppDjDu`y3hDfw zM!SP09X6}h(`d2M4xgP%_Rag5?%v+v24A?>!25$+1CiEtPTSY+?6VKFn_Qv(jS;$4 z>oUf+ZDbRUv7uPZYID-UX!1Yvm5kXq>hAFLB%EVht9i&{vGODBdgrj!)D_Uh%?-v* zO^emr5f&Vlh%xSL=xz%PGqdKDTRiC14O)$z{SFuDYwQZylLc3pdYi@Xr0tEZK9@U4w%B}DnzcE6tjElnXoJDx z3ow?D%f@jIlA%dMi`!xd+AWmNYIE}ev$@fq+;yddF(UyBKs+`8TTH+syWzP+<8;Jg8 zUkLwg1F=szzT8LDM5Lz?#AKdK_L&mSxh3LR7m-yi?^hn1xvO4KqUXO0)5m4Y?N4Tb zVs}}etvf3Fe-B`Gf*83u&T?clq9>!OuudCQ(HtqLctNLA#l&wcEa-SPqLa%svdlEX zmn8<1!H_hgWd&NL(^9O8rgc#jAEqf)G$v572(9Pos34PTh=mPA8j+z73o%}=qg8a2 z=T$VR)vLm7+OUe!Qf*vDj0+32z)am3m*E@Z^6zihWHCFNyy9E-Iy?-?XkGe1b3>@n z;|qC%PA|i=UOLpo_4vliV$1U%=_NVKx=RJ7aJgW)^o_ z#7DK@E?=52Vp*xYA!{)h@{{e0c=i#nmjL?j+*pMl`6kFGK*9dN`}ha@fsz3C{#HGT zjwiv(AUl4ELsQ=ZX8?7OIf+{iNVt-?b{K^p1^)#1Pha4$8-cqBkp1MB>T&EbP(XmX zXVx4-+aCvWVBMd7yc4;f0MCP>b5-YX;X#l=fZVEc1E~B-@D?btfA})aJOoyXr(1f~ z;j+V$eMwQ-7$(0BHvRPfwmn2{foDPXFP?rA-`oO=WT3LZ&7vCTS7Kg8a;>_2t zB11cT2~-vH8m#Dm3Ie46F}n(tcfxnT-MdyF#mX+YN}R{}7rJm&H!LRPr8Set+yh?$ zvIEh*Xl*b2Iav9<)(-qeFBE6A=C#wW;`bA9iU9Y$^qw0}_QN6qD0B_;=+J<;Dd$9T zEgBqzXF%~!UT>E=ti?k^FoyuLo=fC{MyH11Wx(&VR)2)w+$vo_cm3joq&d8PL@HN5 zPTVhP8ug5d7sz?A_|K9gQRkSL4(tE$pd{5e@BoB_yx`hRNmirXUlGG8I+9i{$x8gh zS0(S_vzziIeJ`HdE_su-5kb-wvlGxtfczhsDCC%gCqX84_)$degvI#tJD~W^!1>vH zNnZ!7>%H~T-zwbnHOVr2+O}EJ`MB#r$?^;4z#C}n>tg8q(Nmj|e@g6GtDFBJuK0!& zddB=k3emg7&}HvjpTqa;hARl5e7awcxjmAdtm!vrQR7}Qz_g2%b*S_q_##;Iz^~Kr z+Yd?Zy6N91(7zvs9{?6VN8o?$gVj}_*db@}x?`}A0GTx_wj=&HoCDRza<8GB6Yw;s zjr?T?K7T??2V|XL>d@~_!mHqOTC@kBJ0*=g^Y{TTe*0%|C6QV2%MY$;SW@#}F9v~{