[Xfce4-commits] <moka:master> So permissions of others in various places.

[Nick Schermer]

Updating branch refs/heads/master
         to f659e811b46e11d6a787b93f8b618f8a37bc9f98 (commit)
       from 94180cf0199e1f948d6c9b4ee6a382712ca6bb2a (commit)

commit f659e811b46e11d6a787b93f8b618f8a37bc9f98
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Apr 4 22:25:50 2011 +0200

    So permissions of others in various places.

 lib/helpers/general.rb           |    8 ++++++++
 lib/models/maintainer.rb         |    8 ++++++++
 lib/views/collection.erb         |   10 +++++++++-
 lib/views/maintainer_profile.erb |    3 +++
 lib/views/project.erb            |    3 ++-
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/helpers/general.rb b/lib/helpers/general.rb
index be81387..18449cb 100755
--- a/lib/helpers/general.rb
+++ b/lib/helpers/general.rb
@@ -50,6 +50,14 @@ module Moka
             env[:error].has_key?(key)
           end
         end
+
+      def maintainer_names(model)
+        names = []
+        for maintainer in model.maintainers.sort
+          names << maintainer.realname
+        end
+        names.join(', ')
+      end
       end
     end
   end
diff --git a/lib/models/maintainer.rb b/lib/models/maintainer.rb
index 1815e07..8096b62 100755
--- a/lib/models/maintainer.rb
+++ b/lib/models/maintainer.rb
@@ -50,6 +50,14 @@ module Moka
       def is_admin
         authorized?('admin')
       end
+
+      def project_names
+        names = []
+        for project in self.projects.sort
+          names << project.name
+        end
+        names.join(', ')
+      end
     end
   end
 end
diff --git a/lib/views/collection.erb b/lib/views/collection.erb
index 09acb5a..2808a2e 100755
--- a/lib/views/collection.erb
+++ b/lib/views/collection.erb
@@ -1,4 +1,13 @@
 <%= header :title => "Manage #{@collection.display_name}" %>
+<h2>Collection information</h2>
+<form>
+  <fieldset>
+    <p><label for="website">Website:</label> <%= @collection.website %></p>
+    <p><label for="maintainers">Maintainers:</label> <%= maintainer_names(@collection) %>.</p>
+  </fieldset>
+</form>
+<p><a href="/collection/<%= @collection.name %>/new-release">Release new version</a></p>
+
 <h2>Releases</h2>
 <table cellspacing="0" cellpadding="0">
   <% for release in @collection.releases.sort.reverse %>
@@ -11,5 +20,4 @@
     </tr>
   <% end %>
 </table>
-<p><a href="/collection/<%= @collection.name %>/new-release">Release new version</a></p>
 <%= footer %>
diff --git a/lib/views/maintainer_profile.erb b/lib/views/maintainer_profile.erb
index aea8a9d..0796986 100755
--- a/lib/views/maintainer_profile.erb
+++ b/lib/views/maintainer_profile.erb
@@ -29,4 +29,7 @@
     <p class="quote"><input type="submit" value="Save"/></p>
   </fieldset>
 </form>
+
+<h2>Permissions</h2>
+<p><label for="projects">Projects:</label> <%= @maintainer.project_names %>.</p>
 <%= footer %>
diff --git a/lib/views/project.erb b/lib/views/project.erb
index e8d3fae..affa7a6 100755
--- a/lib/views/project.erb
+++ b/lib/views/project.erb
@@ -2,8 +2,9 @@
 <h2>Project information</h2>
 <form method="post" action="/project/<%= @project.name %>/information">
   <fieldset>
-    <p><label for="website">Website:</label> <input type="text" id="website" name="website" style="width:60%" value="<%= @project.website %>"/></p>
+    <p><label for="website">Website:</label> <input type="text" id="website" name="website" style="width:70%" value="<%= @project.website %>"/></p>
     <p><label for="description">Description:</label> <textarea id="description" name="description" style="height:10em;"><%= @project.description %></textarea></p>
+    <p><label for="maintainers">Maintainers:</label> <%= maintainer_names(@project) %>.
     <p class="quote"><input type="submit" value="Save"/></p>
   </fieldset>
 </form>