projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e55e579
)
Hardcode document name for Sone SSKs to “Sone”.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sat, 23 Oct 2010 20:40:39 +0000
(22:40 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sat, 23 Oct 2010 20:40:39 +0000
(22:40 +0200)
src/main/java/net/pterodactylus/sone/core/Core.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
patch
|
blob
|
history
src/main/resources/templates/include/createSone.html
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
a3c8dc4
..
56e60d4
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-322,7
+322,7
@@
public class Core extends AbstractService {
* if a Sone error occurs
*/
public Sone createSone(String name) throws SoneException {
* if a Sone error occurs
*/
public Sone createSone(String name) throws SoneException {
- return createSone(name, "Sone
-" + name
, null, null);
+ return createSone(name, "Sone
"
, null, null);
}
/**
}
/**
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
index
901874c
..
f67cd56
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
@@
-61,22
+61,17
@@
public class CreateSonePage extends SoneTemplatePage {
protected void processTemplate(Request request, Template template) throws RedirectException {
super.processTemplate(request, template);
String name = "";
protected void processTemplate(Request request, Template template) throws RedirectException {
super.processTemplate(request, template);
String name = "";
- String documentName = null;
String requestUri = null;
String insertUri = null;
if (request.getMethod() == Method.POST) {
name = request.getHttpRequest().getPartAsStringFailsafe("name", 100);
String requestUri = null;
String insertUri = null;
if (request.getMethod() == Method.POST) {
name = request.getHttpRequest().getPartAsStringFailsafe("name", 100);
- documentName = request.getHttpRequest().getPartAsStringFailsafe("document-name", 96);
- if (documentName.trim().length() == 0) {
- documentName = "Sone-" + name;
- }
if (request.getHttpRequest().getParam("create-from-uri").length() > 0) {
requestUri = request.getHttpRequest().getPartAsStringFailsafe("request-uri", 256);
insertUri = request.getHttpRequest().getPartAsStringFailsafe("insert-uri", 256);
}
try {
/* create Sone. */
if (request.getHttpRequest().getParam("create-from-uri").length() > 0) {
requestUri = request.getHttpRequest().getPartAsStringFailsafe("request-uri", 256);
insertUri = request.getHttpRequest().getPartAsStringFailsafe("insert-uri", 256);
}
try {
/* create Sone. */
- Sone sone = webInterface.core().createSone(name,
documentName
, requestUri, insertUri);
+ Sone sone = webInterface.core().createSone(name,
"Sone"
, requestUri, insertUri);
/* log in the new Sone. */
setCurrentSone(request.getToadletContext(), sone);
/* log in the new Sone. */
setCurrentSone(request.getToadletContext(), sone);
diff --git
a/src/main/resources/templates/include/createSone.html
b/src/main/resources/templates/include/createSone.html
index
f2777c3
..
d812b1a
100644
(file)
--- a/
src/main/resources/templates/include/createSone.html
+++ b/
src/main/resources/templates/include/createSone.html
@@
-1,7
+1,6
@@
<script language="javascript">
$(document).ready(function() {
registerInputTextareaSwap("#sone #create-sone input[name=name]", "WebInterface.DefaultText.CreateSoneName", "name", false);
<script language="javascript">
$(document).ready(function() {
registerInputTextareaSwap("#sone #create-sone input[name=name]", "WebInterface.DefaultText.CreateSoneName", "name", false);
- registerInputTextareaSwap("#sone #create-sone input[name=document-name]", "WebInterface.DefaultText.CreateSoneDocumentName", "document-name", false);
registerInputTextareaSwap("#sone #create-sone input[name=insert-uri]", "WebInterface.DefaultText.CreateSoneInsertURI", "insert-uri", true);
registerInputTextareaSwap("#sone #create-sone input[name=request-uri]", "WebInterface.DefaultText.CreateSoneRequestURI", "request-uri", true);
registerInputTextareaSwap("#sone #create-sone input[name=insert-uri]", "WebInterface.DefaultText.CreateSoneInsertURI", "insert-uri", true);
registerInputTextareaSwap("#sone #create-sone input[name=request-uri]", "WebInterface.DefaultText.CreateSoneRequestURI", "request-uri", true);
@@
-35,10
+34,6
@@
<input type="text" name="name" value="<% name|html>"/>
</div>
<div>
<input type="text" name="name" value="<% name|html>"/>
</div>
<div>
- <label for="document-name"><%= Page.Login.CreateSone.Label.DocumentName|l10n|html></label>
- <input type="text" name="document-name" value="<% documentName|html>" />
- </div>
- <div>
<button type="submit" name="create-random" value="1"><%= Page.Login.CreateSone.Button.CreateRandom|l10n|html></button>
</div>
<div class="advanced">
<button type="submit" name="create-random" value="1"><%= Page.Login.CreateSone.Button.CreateRandom|l10n|html></button>
</div>
<div class="advanced">