hooks scaffold

Dmitriy Zaporozhets
1 parent 495deea7
Showing 8 changed files with 40 additions and 7 deletions Show diff stats
app/assets/stylesheets/projects.css.scss
app/controllers/hooks_controller.rb
app/helpers/projects_helper.rb
app/views/hooks/index.html.haml
app/views/hooks/new.html.haml
app/views/hooks/show.html.haml
app/views/repositories/_head.html.haml
config/routes.rb
@@ -181,6 +181,13 @@ input.ssh_project_url {
   }
 }
+.text_field { 
+    width:400px;
+    padding:8px;
+    font-size:14px;
+    @include round-borders-all(4px);
+}
+
 .input_button {
   padding:8px;
   font-size:14px;
@@ -20,13 +20,12 @@ class HooksController &lt; ApplicationController
   def create
     @hook = @project.web_hooks.new(params[:hook])
-    @hook.author = current_user
     @hook.save
     if @hook.valid?
-      redirect_to [@project, @hook]
+      redirect_to project_hook_path(@project, @hook)
     else
-      respond_with(@hook)
+      render :new
     end
   end
@@ -35,7 +35,8 @@ module ProjectsHelper
   end
   def repository_tab_class
-    if controller.controller_name == "repositories"
+    if controller.controller_name == "repositories" ||
+      controller.controller_name == "hooks"
      "current"
     end
   end
 = render "repositories/head"
+.right= link_to "Add new", new_project_hook_path(@project), :class => "grey-button append-bottom-10"
 - unless @hooks.empty?
   %div.update-data.ui-box.ui-box-small
     .data
       - @hooks.each do |hook|
-        %a.update-item{:href => project_hooks_path(@project, hook)}
+        %a.update-item{:href => project_hook_path(@project, hook)}
           %span.update-title{:style => "margin-bottom:0px;"}
             = hook.url
+            %span.update-author.right
+              Added
+              = time_ago_in_words(hook.created_at)
+              ago
 - else 
   %h3 No hooks
+
@@ -0,0 +1,13 @@
+= render "repositories/head"
+= form_for [@project, @hook], :as => :hook, :url => project_hooks_path(@project) do |f|
+  -if @hook.errors.any?
+    %ul
+      - @hook.errors.full_messages.each do |msg|
+        %li= msg
+  = f.label :url, "URL:"
+  = f.text_field :url, :class => "text_field"
+  .clear
+  %br
+  .merge-tabs
+    = f.submit "Save", :class => "grey-button"
+
@@ -0,0 +1,7 @@
+= render "repositories/head"
+= debug @hook
+
+- if can? current_user, :admin_project, @project
+  .merge-tabs
+    .right
+      = link_to 'Remove', project_hook_path(@project, @hook), :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
@@ -8,7 +8,7 @@
   = link_to tags_project_repository_path(@project), :class => "tab #{'active' if current_page?(tags_project_repository_path(@project)) }" do 
     %span 
     Tags
-  -#= link_to "#", :class => "tab" do 
+  = link_to project_hooks_path, :class => "tab #{'active' if controller.controller_name == "hooks" }" do 
     %span
     Hooks
   -#= link_to "#", :class => "tab" do 
@@ -84,8 +84,8 @@ Gitlab::Application.routes.draw do
       end
     end
-    resources :hooks, :only => [:index, :new, :create, :destroy, :show]
     resources :snippets
+    resources :hooks, :only => [:index, :new, :create, :destroy, :show]
     resources :commits
     resources :team_members
     resources :issues do
	@@ -181,6 +181,13 @@ input.ssh_project_url {		@@ -181,6 +181,13 @@ input.ssh_project_url {
181	}	181	}
182	}	182	}
183		183
		184	+.text_field {
		185	+ width:400px;
		186	+ padding:8px;
		187	+ font-size:14px;
		188	+ @include round-borders-all(4px);
		189	+}
		190	+
184	.input_button {	191	.input_button {
185	padding:8px;	192	padding:8px;
186	font-size:14px;	193	font-size:14px;
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+= render "repositories/head"
	2	+= form_for [@project, @hook], :as => :hook, :url => project_hooks_path(@project) do \|f\|
	3	+ -if @hook.errors.any?
	4	+ %ul
	5	+ - @hook.errors.full_messages.each do \|msg\|
	6	+ %li= msg
	7	+ = f.label :url, "URL:"
	8	+ = f.text_field :url, :class => "text_field"
	9	+ .clear
	10	+ %br
	11	+ .merge-tabs
	12	+ = f.submit "Save", :class => "grey-button"
	13	+
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+= render "repositories/head"
	2	+= debug @hook
	3	+
	4	+- if can? current_user, :admin_project, @project
	5	+ .merge-tabs
	6	+ .right
	7	+ = link_to 'Remove', project_hook_path(@project, @hook), :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	= link_to tags_project_repository_path(@project), :class => "tab #{'active' if current_page?(tags_project_repository_path(@project)) }" do	8	= link_to tags_project_repository_path(@project), :class => "tab #{'active' if current_page?(tags_project_repository_path(@project)) }" do
9	%span	9	%span
10	Tags	10	Tags
11	- -#= link_to "#", :class => "tab" do	11	+ = link_to project_hooks_path, :class => "tab #{'active' if controller.controller_name == "hooks" }" do
12	%span	12	%span
13	Hooks	13	Hooks
14	-#= link_to "#", :class => "tab" do	14	-#= link_to "#", :class => "tab" do