Commit 5ab3e38e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #1371 from tsigo/project_panel

Refactor the project clone panel
parents 874a86f8 0bc4ecfe
function Projects() {
$("#project_name").live("change", function(){
var slug = slugify($(this).val());
$("#project_code").val(slug);
$("#project_path").val(slug);
});
$('.new_project, .edit_project').live('ajax:before', function() {
$('.project_new_holder, .project_edit_holder').hide();
$('.save-project-loader').show();
});
$('form #project_default_branch').chosen();
disableButtonIfEmtpyField("#project_name", ".project-submit")
}
function initGitCloneSwitcher() {
var link_sel = ".project_clone_holder button";
$(link_sel).bind("click", function(e) {
$(link_sel).removeClass("active");
$(this).addClass("active");
$("#project_clone").val($(this).attr("data-clone"));
})
}
window.Projects = ->
$("#project_name").live "change", ->
slug = slugify($(this).val())
$("#project_code").val(slug)
$("#project_path").val(slug)
$(".new_project, .edit_project").live "ajax:before", ->
$(".project_new_holder, .project_edit_holder").hide()
$(".save-project-loader").show()
$("form #project_default_branch").chosen()
disableButtonIfEmtpyField "#project_name", ".project-submit"
# Git clone panel switcher
$ ->
scope = $('.project_clone_holder')
if scope.length > 0
$('a, button', scope).click ->
$('a, button', scope).removeClass('active')
$(this).addClass('active')
$('#project_clone', scope).val($(this).data('clone'))
......@@ -135,7 +135,7 @@ class ApplicationController < ActionController::Base
end
def require_non_empty_project
redirect_to @project unless @project.repo_exists? && @project.has_commits?
redirect_to @project if @project.empty_repo?
end
def no_cache_headers
......
......@@ -50,7 +50,7 @@ class ProjectsController < ApplicationController
respond_to do |format|
format.html do
if @project.repo_exists? && @project.has_commits?
unless @project.empty_repo?
@last_push = current_user.recent_push(@project.id)
render :show
else
......
......@@ -8,6 +8,10 @@ module Repository
false
end
def empty_repo?
!repo_exists? || !has_commits?
end
def commit(commit_id = nil)
Commit.find_or_first(repo, commit_id, root_ref)
end
......@@ -38,7 +42,7 @@ module Repository
def has_post_receive_file?
hook_file = File.join(path_to_repo, 'hooks', 'post-receive')
File.exists?(hook_file)
File.exists?(hook_file)
end
def tags
......@@ -67,7 +71,7 @@ module Repository
def repo_exists?
@repo_exists ||= (repo && !repo.branches.empty?)
rescue
rescue
@repo_exists = false
end
......@@ -94,7 +98,7 @@ module Repository
!!commit
end
def root_ref
def root_ref
default_branch || "master"
end
......@@ -104,7 +108,7 @@ module Repository
# Archive Project to .tar.gz
#
# Already packed repo archives stored at
# Already packed repo archives stored at
# app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
#
def archive_repo ref
......
......@@ -8,14 +8,14 @@
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span5"
.span4.right
.right
- if can? current_user, :download_code, @project
= link_to archive_project_repository_path(@project), class: "btn small grouped" do
%i.icon-download-alt
Download
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
= link_to new_project_merge_request_path(@project), title: "New Merge Request", class: "btn small grouped" do
Merge Request
- if @project.issues_enabled && can?(current_user, :write_issue, @project)
= link_to new_project_issue_path(@project), title: "New Issue", class: "btn small grouped" do
Issue
- unless @project.empty_repo?
- if can? current_user, :download_code, @project
= link_to archive_project_repository_path(@project), class: "btn small grouped" do
%i.icon-download-alt
Download
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
= link_to new_project_merge_request_path(@project), title: "New Merge Request", class: "btn small grouped" do
Merge Request
- if @project.issues_enabled && can?(current_user, :write_issue, @project)
= link_to new_project_issue_path(@project), title: "New Issue", class: "btn small grouped" do
Issue
%h5.title
= @project.name
%br
%div
%a.btn.info{href: tree_project_ref_path(@project, @project.root_ref)} Browse code
&nbsp;
%a.btn{href: project_commits_path(@project)} Commits
%strong.right
= link_to project_path(@project) do
Switch to project &rarr;
%br
.alert-message.block-message.warning
.input
.input-prepend
%span.add-on git clone
= text_field_tag :project_clone, @project.url_to_repo, class: "xlarge one_click_select git_clone_url"
= simple_format @project.description
- unless @events.blank?
%h4.middle_title Recent Activity
.content_list= render @events
= render 'shared/no_ssh'
.project_clone_panel
.row
.span7
.form-horizontal
.input-prepend.project_clone_holder
= link_to "SSH", "#", class: "btn small active", :"data-clone" => @project.ssh_url_to_repo
= link_to "HTTP", "#", class: "btn small", :"data-clone" => @project.http_url_to_repo
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span5"
= render 'clone_panel'
%div.git-empty
%h4 Git global setup:
%pre.dark
......@@ -36,16 +30,3 @@
- if can? current_user, :admin_project, @project
.prepend-top-20
= link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn danger right"
:javascript
$(function(){
var link_sel = ".project_clone_holder a";
$(link_sel).bind("click", function() {
$(link_sel).removeClass("active");
$(this).addClass("active");
$("#project_clone").val($(this).attr("data-clone"));
})
})
......@@ -2,8 +2,3 @@
= render 'clone_panel'
= render "events/event_last_push", event: @last_push
.content_list= render @events
:javascript
$(function(){
initGitCloneSwitcher();
})
......@@ -12,8 +12,3 @@
%button{class: "btn small active", :"data-clone" => @project.ssh_url_to_repo} SSH
%button{class: "btn small", :"data-clone" => @project.http_url_to_repo} HTTP
= text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span5"
:javascript
$(function(){
initGitCloneSwitcher();
})
require 'spec_helper'
describe Project, "Repository" do
let(:project) { build(:project) }
describe "#empty_repo?" do
it "should return true if the repo doesn't exist" do
project.stub(repo_exists?: false, has_commits?: true)
project.should be_empty_repo
end
it "should return true if the repo has commits" do
project.stub(repo_exists?: true, has_commits?: false)
project.should be_empty_repo
end
it "should return false if the repo exists and has commits" do
project.stub(repo_exists?: true, has_commits?: true)
project.should_not be_empty_repo
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment