Don't override my/account view anymore, hook is better

Author: root

Diff for: app/controllers/gitolite_public_keys_controller.rb

@@ -3,16 +3,18 @@ class GitolitePublicKeysController < ApplicationController
 
   before_filter :require_login
   before_filter :set_user_variable
-  before_filter :set_users_keys, :except => [:index, :new, :reset_rss_key]
-  before_filter :find_gitolite_public_key, :except => [:index, :new, :reset_rss_key, :create]
-
-  helper :issues
-  helper :users
-  helper :custom_fields
+  before_filter :find_gitolite_public_key, :only => [:destroy]
 
   helper :gitolite_public_keys
 
 
+  def index
+    @gitolite_user_keys   = @user.gitolite_public_keys.user_key.order('title ASC, created_at ASC')
+    @gitolite_deploy_keys = @user.gitolite_public_keys.deploy_key.order('title ASC, created_at ASC')
+    @gitolite_public_key  = GitolitePublicKey.new
+  end
+
+
   def create
     @gitolite_public_key = GitolitePublicKey.new(params[:gitolite_public_key])
     @gitolite_public_key.user = @user
@@ -33,7 +35,7 @@ def create
       end
     else
       respond_to do |format|
-        format.html { redirect_to @redirect_url }
+        format.html { redirect_to @cancel_url }
       end
     end
   end
@@ -56,23 +58,22 @@ def set_user_variable
     if params[:user_id]
       @user = (params[:user_id] == 'current') ? User.current : User.find_by_id(params[:user_id])
       if @user
-        @redirect_url = url_for(:controller => 'users', :action => 'edit', :id => params[:user_id], :tab => 'keys')
+        @cancel_url = @redirect_url = url_for(:controller => 'users', :action => 'edit', :id => params[:user_id], :tab => 'keys')
       else
         render_404
       end
     else
-      @user = User.current
-      @redirect_url = url_for(:controller => 'my', :action => 'account')
+      if User.current.allowed_to?(:create_gitolite_ssh_key, nil, :global => true)
+        @user = User.current
+        @redirect_url = url_for(:controller => 'gitolite_public_keys', :action => 'index')
+        @cancel_url = url_for(:controller => 'my', :action => 'account')
+      else
+        render_403
+      end
     end
   end
 
 
-  def set_users_keys
-    @gitolite_user_keys   = @user.gitolite_public_keys.user_key.order('title ASC, created_at ASC')
-    @gitolite_deploy_keys = @user.gitolite_public_keys.deploy_key.order('title ASC, created_at ASC')
-  end
-
-
   def find_gitolite_public_key
     key = GitolitePublicKey.find_by_id(params[:id])
     if key && (@user == key.user || @user.admin?)

Diff for: app/views/gitolite_public_keys/_form.html.erb

@@ -1,9 +1,8 @@
 <div id="validation_messages"><%= error_messages_for 'gitolite_public_key' %></div>
 
-<%= labelled_form_for gitolite_public_key,
-    :as   => :gitolite_public_key,
-    :url  => {:controller => 'gitolite_public_keys', :action => 'create', :id => gitolite_public_key.id, :user_id => params[:id], :tab => params[:id]&&'keys'},
-    :html => {:method => :post} do |f| %>
+<%= labelled_form_for :gitolite_public_key, gitolite_public_key,
+                      :url  => {:controller => 'gitolite_public_keys', :action => 'create', :user_id => params[:id], :tab => params[:id]&&'keys'},
+                      :html => {:method => :post} do |f| %>
 
   <p><%= f.text_field :title, :label => :label_identifier_can_be_arbitrary, :required => true, :style => 'width: 97%;' %></p>
 

Diff for: app/views/gitolite_public_keys/_view.html.erb

@@ -1,8 +1,5 @@
 <%= stylesheet_link_tag 'application', :plugin => 'redmine_git_hosting' %>
 
-<fieldset class="box">
-  <legend><%= l(:label_public_keys) %></legend>
-
   <fieldset class="public_key_view">
     <legend><%= l(:label_current_user_keys) %></legend>
     <%= render :partial => 'gitolite_public_keys/ssh_keys', :locals => {:ssh_keys => @gitolite_user_keys} %>
@@ -22,9 +19,6 @@
     <%= render :partial => 'gitolite_public_keys/form', :locals => {:gitolite_public_key => @gitolite_public_key, :user => @user} %>
   </fieldset>
 
-</fieldset>
-
-
 <%= javascript_tag do %>
   function load_form_actions() {
     $('#gitolite_public_key_key_type').on('change', function() {

Diff for: app/views/gitolite_public_keys/index.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'gitolite_public_keys/view' %>

Diff for: app/views/my/account.html.erb

@@ -157,41 +157,6 @@ REPOSITORY SETTINGS
 }
 
 
-/*
-PUBLIC KEY
-*/
-.public_key_view {
-  background-color: #fff;
-  padding: 5px;
-}
-
-.public_key_view label {
-  font-weight: bold;
-  text-align: right;
-}
-
-.public_key_view .myhead {
-  font-style: italic;
-  color: #000;
-  size: 140%;
-  padding: 10px 10px 0px 0px;
-  margin-bottom: 5px;
-  border-bottom: 1px solid #bbbbbb;
-}
-
-.public_key_view p {
-  margin-top: 0px;
-  margin-bottom: 5px;
-  padding-top: 0px;
-}
-
-.public_key_view legend {
-  font-style: italic;
-  color: #000;
-  size: 130%;
-}
-
-
 /*
 MISC
 */

Diff for: assets/stylesheets/application.css

@@ -180,6 +180,7 @@ en:
   field_key: this key
 
   # User SSH keys (labels)
+  label_my_public_keys: My public keys
   label_public_keys: Public keys
   label_public_key: Public key
   label_public_key_edit: Edit existing public key

Diff for: config/locales/plugin_interface/en.yml

@@ -180,6 +180,7 @@ fr:
   field_key: cette clé
 
   # User SSH keys (labels)
+  label_my_public_keys: Mes clés publiques
   label_public_keys: Clés publiques
   label_public_key: Clé publique
   label_public_key_edit: Modifier une clé publique existante

Diff for: config/locales/plugin_interface/fr.yml

@@ -40,12 +40,11 @@
   require_dependency 'redmine_git_hosting/patches/issue_patch'
   require_dependency 'redmine_git_hosting/patches/journal_patch'
 
-  require_dependency 'redmine_git_hosting/patches/my_controller_patch'
-
   require_dependency 'redmine_git_hosting/patches/sys_controller_patch'
 
   ## Redmine Git Hosting Hooks
   require_dependency 'redmine_git_hosting/hooks/add_plugin_icon'
+  require_dependency 'redmine_git_hosting/hooks/add_public_keys_link'
   require_dependency 'redmine_git_hosting/hooks/display_git_urls_on_project'
   require_dependency 'redmine_git_hosting/hooks/display_git_urls_on_repository_edit'
   require_dependency 'redmine_git_hosting/hooks/display_repository_extras'

Diff for: lib/redmine_git_hosting.rb

@@ -0,0 +1,7 @@
+module RedmineGitHosting
+  module Hooks
+    class AddPublicKeysLink < Redmine::Hook::ViewListener
+      render_on :view_my_account_contextual, :inline => "| <%= link_to l(:label_my_public_keys), public_keys_path, :class => 'icon icon-passwd' %>"
+    end
+  end
+end