add labels to issues ・ e0b7119 ・ Gitprep

- add labels to issues;
- Browse files
- Yuki Kimoto commited on 2016-08-02
- 1 parent 3c10d33
  
  commit e0b7119b507d0e57555f61563698aa7b80ebb3b3

Showing 3 changed files with 31 additions and 2 deletions

+9 -1

public/css/common.css

@@ -179,7 +179,15 @@
   color:#767676;
 }
 
-
+ul.issues-label-pallet {
+  display:inline-block;
+}
+ul.issues-label-pallet li {
+  display:inline-block;
+  border-radius:3px;
+  padding:1px 3px;
+  font-size:95%;
+}
 .issues-title a {
   color:black;
 }

+17 -1

templates/issues.html.ep

View

@@ -75,7 +75,9 @@
         <div class="issues-labels"><a href="<%= url_for("/$user_id/$project_id/labels") %>">Labels</a></div>
       </div>
       <div class="issues-button-container-right">
-        <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-success">New issue</a>
+        % if ($api->logined) {
+          <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-success">New issue</a>
+        % }
       </div>
     </div>
     <div class="issues">
@@ -94,6 +96,13 @@
         % if (@$issues) {
           <ul>
             % for my $issue (@$issues) {
+              <%
+                my $issue_labels = app->dbi->model('issue_label')->select(
+                  {label => ['id', 'color']},
+                  where => {issue => $issue->{row_id}}
+                )->all;
+              %>
+
               <%
                 my $open_time = $issue->{open_time};
                 my $open_time_age = Time::Moment->now->epoch - $open_time;
@@ -104,6 +113,13 @@
                   <a href="<%= "/$user_id/$project_id/issues/$issue->{number}" %>">
                     <b><%= $issue->{title} %></b>
                   </a>
+                  <ul class="issues-label-pallet">
+                    % for my $issue_label (@$issue_labels) {
+                      <li style="background:<%= $issue_label->{'label.color'} %>">
+                        <%= $issue_label->{'label.id'} %>
+                      </li>
+                    % }
+                  </ul>
                 </div>
                 <div class="issues-description">
                   #<%= $issue->{number} %> <%= $issue->{open} ? 'opened' : 'closed' %>

templates/issues/new.html.ep

View

@@ -7,6 +7,11 @@
   my $project_id = param('project');
   my $issue_number = param('number');
   
+  unless ($api->logined) {
+    $self->redirect_to("/$user_id/$project_id/issues");
+    return;
+  }
+  
   my $errors;
   if (lc $self->req->method eq 'post') {
     my $op = param('op');

...	...	@@ -179,7 +179,15 @@
179	179	color:#767676;
180	180	}
181	181
182		-
	182	+ul.issues-label-pallet {
	183	+ display:inline-block;
	184	+}
	185	+ul.issues-label-pallet li {
	186	+ display:inline-block;
	187	+ border-radius:3px;
	188	+ padding:1px 3px;
	189	+ font-size:95%;
	190	+}
183	191	.issues-title a {
184	192	color:black;
185	193	}

...	...	@@ -75,7 +75,9 @@
75	75	<div class="issues-labels"><a href="<%= url_for("/$user_id/$project_id/labels") %>">Labels</a></div>
76	76	</div>
77	77	<div class="issues-button-container-right">
78		- <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-success">New issue</a>
	78	+ % if ($api->logined) {
	79	+ <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-success">New issue</a>
	80	+ % }
79	81	</div>
80	82	</div>
81	83	<div class="issues">
...	...	@@ -94,6 +96,13 @@
94	96	% if (@$issues) {
95	97	<ul>
96	98	% for my $issue (@$issues) {
	99	+ <%
	100	+ my $issue_labels = app->dbi->model('issue_label')->select(
	101	+ {label => ['id', 'color']},
	102	+ where => {issue => $issue->{row_id}}
	103	+ )->all;
	104	+ %>
	105	+
97	106	<%
98	107	my $open_time = $issue->{open_time};
99	108	my $open_time_age = Time::Moment->now->epoch - $open_time;
...	...	@@ -104,6 +113,13 @@
104	113	<a href="<%= "/$user_id/$project_id/issues/$issue->{number}" %>">
105	114	<b><%= $issue->{title} %></b>
106	115	</a>
	116	+ <ul class="issues-label-pallet">
	117	+ % for my $issue_label (@$issue_labels) {
	118	+ <li style="background:<%= $issue_label->{'label.color'} %>">
	119	+ <%= $issue_label->{'label.id'} %>
	120	+ </li>
	121	+ % }
	122	+ </ul>
107	123	</div>
108	124	<div class="issues-description">
109	125	#<%= $issue->{number} %> <%= $issue->{open} ? 'opened' : 'closed' %>

...	...	@@ -7,6 +7,11 @@
7	7	my $project_id = param('project');
8	8	my $issue_number = param('number');
9	9
	10	+ unless ($api->logined) {
	11	+ $self->redirect_to("/$user_id/$project_id/issues");
	12	+ return;
	13	+ }
	14	+
10	15	my $errors;
11	16	if (lc $self->req->method eq 'post') {
12	17	my $op = param('op');