Show right-hand column on version page to crate owners.

Among other things, this makes the "Manage owners" link available even if all versions of a crate were yanked.
rust-lang · Jun 5, 2019 · c7823b4 · c7823b4
1 parent 293a3fb
commit c7823b4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/app/controllers/crate/version.js b/app/controllers/crate/version.js
@@ -33,6 +33,11 @@ export default Controller.extend({
     isOwner: computed('crate.owner_user', 'session.currentUser.id', function() {
         return this.get('crate.owner_user').findBy('id', this.get('session.currentUser.id'));
     }),
+    notYankedOrIsOwner: computed('model', 'crate.owner_user', 'session.currentUser.id', function() {
+        return (
+            !this.get('model').yanked || this.get('crate.owner_user').findBy('id', this.get('session.currentUser.id'))
+        );
+    }),
 
     sortedVersions: readOnly('crate.versions'),
 

diff --git a/app/templates/crate/version.hbs b/app/templates/crate/version.hbs
@@ -51,20 +51,18 @@
     </div>
 </div>
 
-{{#if currentVersion.yanked}}
-    <div class='crate-info'>
-        <div>
-        <p>This crate has been yanked, but it is still available for download for
-        other crates that may be depending on it.</p>
-        <p>You may wish to
-          {{#link-to 'crate.versions' crate}}view all versions{{/link-to}} to find one that
-          has not been yanked.
-        </p>
-        </div>
-    </div>
-{{else}}
 <div class='crate-info'>
     <div class='docs'>
+        {{#if currentVersion.yanked}}
+        <p>
+            This crate has been yanked, but it is still available for download for other crates that
+            may be depending on it.
+        </p>
+        <p>
+            You may wish to {{#link-to 'crate.versions' crate}}view all versions{{/link-to}} to find
+            one that has not been yanked.
+        </p>
+        {{else}}
         <div class='install'>
             <div class='action'>Cargo.toml</div>
             <code id="crate-toml">{{ crate.name }} = "{{ currentVersion.num }}"</code>
@@ -99,7 +97,9 @@
                 </div>
             {{/if}}
         {{/if}}
+        {{/if}}
     </div>
+    {{#if notYankedOrIsOwner}}
     <section class='authorship' aria-label="Crate metadata">
         <div class='top'>
             <div>
@@ -240,8 +240,10 @@
             {{/if}}
         </div>
     </section>
+    {{/if}}
 </div>
 
+{{#unless currentVersion.yanked}}
 <div id='crate-downloads'>
     <div class='stats'>
         <h3>Stats Overview</h3>
@@ -293,4 +295,4 @@
         {{download-graph data=downloadData}}
     </div>
 </div>
-{{/if}}
+{{/unless}}