Commit @386be845c69bab2332ec92123e4c8629daab4d1e

Yi EungJun 2013-01-17

Uploader: Handle the case user has no permission.

* Hide upload form if the user has no permission.
* Add status code and reason phrase to upload failed message.

@386be845c69bab2332ec92123e4c8629daab4d1e

905dd19

386be84

app/views/board/newPost.scala.html

--- app/views/board/newPost.scala.html

+++ app/views/board/newPost.scala.html


       <label for="content">
         @helper.textarea(form("contents"), 'markdown -> true, 'class->"text content")
       </label>
+      @if(UserApp.currentUser() != UserApp.anonymous) {
       <div id="upload" resourceType=@Resource.BOARD_POST></div>
+      }
       <!--
       <div class="content-footer">
         <div class="attach-wrap">

905dd19

386be84

app/views/board/post.scala.html

--- app/views/board/post.scala.html

+++ app/views/board/post.scala.html


             </style>
             @helper.textarea(commentForm("contents"), 'placeholder->"로그인 후 댓글 입력이 가능합니다.", 'class->"text comment", 'markdown->true)
             <button class="comment-btn">COMMENT</button>
+            @if(UserApp.currentUser() != UserApp.anonymous) {
             <div id="upload" resourceType=@Resource.BOARD_COMMENT></div>
+            }
           </div>
           <!--
           <div class="attach-wrap">

905dd19

386be84

app/views/issue/issue.scala.html

--- app/views/issue/issue.scala.html

+++ app/views/issue/issue.scala.html


      <textarea id="comment-editor" name="contents" class="span8 textbody .inputxx-large" rows="5" markdown></textarea>
      <input class="btn add-on" type="submit" value=@Messages( "button.comment.new") />
    </div>
+   @if(UserApp.currentUser() != UserApp.anonymous) {
    <div id="upload" resourceType=@Resource.ISSUE_COMMENT></div>
+   }
 }
 </div>
 

905dd19

386be84

app/views/issue/newIssue.scala.html

--- app/views/issue/newIssue.scala.html

+++ app/views/issue/newIssue.scala.html


 @import helper._
 @import scala.collection.mutable.Map
 @implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) }
+@import controllers.UserApp;
 
 @isVisible(resource: models.enumeration.Resource)(content: => Html) = @{
   roleCheck(session.get("userId"), project.id, resource, models.enumeration.Operation.EDIT){

             'rows -> 16,
             'class -> "textbody",
             'markdown -> true)
+        @if(UserApp.currentUser() != UserApp.anonymous) {
         <div id="upload" resourceType=@Resource.ISSUE_POST></div>
+        }
         </fieldset>
 
         <!-- issue.label js module appends a label selector here. -->

905dd19

386be84

public/javascripts/uploader.js

--- public/javascripts/uploader.js

+++ public/javascripts/uploader.js


       setProgressBar(100);
     },
 
-    error: function(responseBody, statusText, xhr) {
-      notification.text('Failed to upload.');
+    error: function(response) {
+      notification.text('Failed to upload: ' + response.status + ' ' + response.statusText);
       _replaceFileInputControl();
       setProgressBar(0);
     },

Add a comment

Open 0
Closed 0

List

...	...	@@ -76,7 +76,9 @@
76	76	</style>
77	77	@helper.textarea(commentForm("contents"), 'placeholder->"로그인 후 댓글 입력이 가능합니다.", 'class->"text comment", 'markdown->true)
78	78	<button class="comment-btn">COMMENT</button>
	79	+ @if(UserApp.currentUser() != UserApp.anonymous) {
79	80	<div id="upload" resourceType=@Resource.BOARD_COMMENT></div>
	81	+ }
80	82	</div>
81	83	<!--
82	84	<div class="attach-wrap">

...	...	@@ -121,7 +121,9 @@
121	121	<textarea id="comment-editor" name="contents" class="span8 textbody .inputxx-large" rows="5" markdown></textarea>
122	122	<input class="btn add-on" type="submit" value=@Messages( "button.comment.new") />
123	123	</div>
	124	+ @if(UserApp.currentUser() != UserApp.anonymous) {
124	125	<div id="upload" resourceType=@Resource.ISSUE_COMMENT></div>
	126	+ }
125	127	}
126	128	</div>
127	129

...	...	@@ -3,6 +3,7 @@
3	3	@import helper._
4	4	@import scala.collection.mutable.Map
5	5	@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) }
	6	+@import controllers.UserApp;
6	7
7	8	@isVisible(resource: models.enumeration.Resource)(content: => Html) = @{
8	9	roleCheck(session.get("userId"), project.id, resource, models.enumeration.Operation.EDIT){
...	...	@@ -40,7 +41,9 @@
40	41	'rows -> 16,
41	42	'class -> "textbody",
42	43	'markdown -> true)
	44	+ @if(UserApp.currentUser() != UserApp.anonymous) {
43	45	<div id="upload" resourceType=@Resource.ISSUE_POST></div>
	46	+ }
44	47	</fieldset>
45	48
46	49	<!-- issue.label js module appends a label selector here. -->

...	...	@@ -160,8 +160,8 @@
160	160	setProgressBar(100);
161	161	},
162	162
163		- error: function(responseBody, statusText, xhr) {
164		- notification.text('Failed to upload.');
	163	+ error: function(response) {
	164	+ notification.text('Failed to upload: ' + response.status + ' ' + response.statusText);
165	165	_replaceFileInputControl();
166	166	setProgressBar(0);
167	167	},

...	...	@@ -21,7 +21,9 @@
21	21	<label for="content">
22	22	@helper.textarea(form("contents"), 'markdown -> true, 'class->"text content")
23	23	</label>
	24	+ @if(UserApp.currentUser() != UserApp.anonymous) {
24	25	<div id="upload" resourceType=@Resource.BOARD_POST></div>
	26	+ }
25	27	<!--
26	28	<div class="content-footer">
27	29	<div class="attach-wrap">

Delete comment