Skip to content

Commit

Permalink
Batch mirror fix
Browse files Browse the repository at this point in the history
  • Loading branch information
unknwon committed Apr 27, 2014
1 parent 1badb2b commit 59d0e73
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 80 deletions.
1 change: 1 addition & 0 deletions .gopmfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ github.com/lib/pq =
github.com/nfnt/resize =
github.com/qiniu/log =
github.com/robfig/cron =
github.com/juju2013/goldap =

[res]
include = templates|public|conf
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Want to hack on Gogs? Awesome! Here are instructions to get you started. They ar

### Pull requests are always welcome

**ALL PULL REQUESTS MUST SEND TO `DEV` BRANCH**

We are always thrilled to receive pull requests, and do our best to process them as fast as possible. Not sure if that typo is worth a pull request? Do it! We will appreciate it.

If your pull request is not accepted on the first try, don't be discouraged! If there's a problem with the implementation, hopefully you received feedback on what to improve.
Expand Down
8 changes: 4 additions & 4 deletions modules/base/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ var (
Domain string
SecretKey string
RunUser string
LdapAuth bool

RepoRootPath string
ScriptType string
Expand Down Expand Up @@ -93,6 +92,7 @@ var Service struct {
NotifyMail bool
ActiveCodeLives int
ResetPwdCodeLives int
LdapAuth bool
}

func ExecDir() (string, error) {
Expand Down Expand Up @@ -179,8 +179,8 @@ func newLogService() {
}

func newLdapService() {
LdapAuth = Cfg.MustBool("security", "LDAP_AUTH", false)
if !LdapAuth {
Service.LdapAuth = Cfg.MustBool("security", "LDAP_AUTH", false)
if !Service.LdapAuth {
return
}

Expand All @@ -201,7 +201,7 @@ func newLdapService() {
}
if nbsrc == 0 {
log.Warn("No valide LDAP found, LDAP Authentication NOT enabled")
LdapAuth = false
Service.LdapAuth = false
return
}

Expand Down
7 changes: 5 additions & 2 deletions modules/middleware/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
var displayBare bool

if len(args) >= 1 {
validBranch = args[0]
// Note: argument has wrong value in Go1.3 martini.
// validBranch = args[0]
validBranch = true
}

if len(args) >= 2 {
displayBare = args[1]
// displayBare = args[1]
displayBare = true
}

var (
Expand Down
4 changes: 2 additions & 2 deletions public/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -470,10 +470,10 @@ function initInstall() {
(function () {
$('#install-database').on("change", function () {
var val = $(this).val();
if (val != "sqlite") {
if (val != "SQLite3") {
$('.server-sql').show();
$('.sqlite-setting').addClass("hide");
if (val == "pgsql") {
if (val == "PostgreSQL") {
$('.pgsql-setting').removeClass("hide");
} else {
$('.pgsql-setting').addClass("hide");
Expand Down
16 changes: 15 additions & 1 deletion routers/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ func GlobalInit() {
checkRunMode()
}

func renderDbOption(ctx *middleware.Context) {
ctx.Data["DbOptions"] = []string{"MySQL", "PostgreSQL", "SQLite3"}
}

func Install(ctx *middleware.Context, form auth.InstallForm) {
if base.InstallLock {
ctx.Handle(404, "install.Install", errors.New("Installation is prohibited"))
Expand Down Expand Up @@ -104,6 +108,13 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
form.AppUrl = base.AppUrl
}

renderDbOption(ctx)
curDbValue := ""
if models.EnableSQLite3 {
curDbValue = "SQLite3" // Default when enabled.
}
ctx.Data["CurDbValue"] = curDbValue

auth.AssignForm(form, ctx.Data)
ctx.HTML(200, "install")
}
Expand All @@ -117,6 +128,9 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
ctx.Data["Title"] = "Install"
ctx.Data["PageIsInstall"] = true

renderDbOption(ctx)
ctx.Data["CurDbValue"] = form.Database

if ctx.HasError() {
ctx.HTML(200, "install")
return
Expand All @@ -129,7 +143,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {

// Pass basic check, now test configuration.
// Test database setting.
dbTypes := map[string]string{"mysql": "mysql", "pgsql": "postgres", "sqlite": "sqlite3"}
dbTypes := map[string]string{"MySQL": "mysql", "PostgreSQL": "postgres", "SQLite3": "sqlite3"}
models.DbCfg.Type = dbTypes[form.Database]
models.DbCfg.Host = form.Host
models.DbCfg.User = form.User
Expand Down
8 changes: 5 additions & 3 deletions routers/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,14 @@ func SignInPost(ctx *middleware.Context, form auth.LogInForm) {

var user *models.User
var err error
// try to login against LDAP if defined
if base.LdapAuth {
if base.Service.LdapAuth {
user, err = models.LoginUserLdap(form.UserName, form.Password)
if err != nil {
log.Error("Fail to login through LDAP: %v", err)
}
}
// try local if not LDAP or it's failed
if (!base.LdapAuth) || (err != nil) {
if !base.Service.LdapAuth || err != nil {
user, err = models.LoginUserPlain(form.UserName, form.Password)
}
if err != nil {
Expand Down
5 changes: 4 additions & 1 deletion templates/base/footer.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
<div class="col-md-1" style="margin: -5px;">
<a target="_blank" href="https://github.com/gogits/gogs"><i class="fa fa-github fa-2x"></i></a>
</div>
<p class="desc"></p>

<div class="col-md-5">
<p class="desc"></p>
</div>
</div>
</div>
</footer>
Expand Down
13 changes: 7 additions & 6 deletions templates/install.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
<label class="col-md-3 control-label">Database Type: </label>
<div class="col-md-8">
<select name="database" id="install-database" class="form-control">
<option value="mysql">MySQL</option>
<option value="pgsql">PostgreSQL</option>
<option value="sqlite">SQLite3</option>
{{if .CurDbValue}}<option value="{{.CurDbValue}}">{{.CurDbValue}}</option>{{end}}
{{range .DbOptions}}
{{if not (eq $.CurDbValue .)}}<option value="{{.}}">{{.}}</option>{{end}}
{{end}}
</select>
</div>
</div>

<div class="server-sql">
<div class="server-sql {{if eq .CurDbValue "SQLite3"}}hide{{end}}">
<div class="form-group">
<label class="col-md-3 control-label">Host: </label>
<div class="col-md-8">
Expand Down Expand Up @@ -49,7 +50,7 @@
</div>
</div>

<div class="form-group pgsql-setting hide">
<div class="form-group pgsql-setting {{if not (eq .CurDbValue "PostgreSQL")}}hide{{end}}">
<label class="col-md-3 control-label">SSL Mode: </label>
<div class="col-md-8">
<select name="ssl_mode" class="form-control">
Expand All @@ -61,7 +62,7 @@
</div>
</div>

<div class="sqlite-setting hide">
<div class="sqlite-setting {{if not (eq .CurDbValue "SQLite3")}}hide{{end}}">
<div class="form-group">
<label class="col-md-3 control-label">Path: </label>

Expand Down
45 changes: 23 additions & 22 deletions templates/repo/single_file.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,31 @@
</div>
{{end}}
</div>

{{if not .FileIsText}}
<div class="panel-footer text-center">
{{if .IsImageFile}}
<img src="{{.FileLink}}">
{{else}}
<a href="{{.FileLink}}" class="btn btn-default">View Raw</a>
{{end}}
</div>
{{else}}
{{if .ReadmeExist}}
<div class="panel-body file-body markdown">
{{.FileContent|str2html}}
</div>
<div class="panel-body file-body file-code code-view">
{{if .IsImageFile}}
<img src="{{.FileLink}}">
{{else}}
<div class="panel-body file-body file-code code-view">
<table>
<tbody>
<tr>
<td class="lines-num"></td>
<td class="lines-code markdown"><pre class="prettyprint linenums{{if .FileExt}} lang-{{.FileExt}}{{end}}">{{.FileContent}}</pre></td>
</tr>
</tbody>
</table>
</div>
<a href="{{.FileLink}}" class="btn btn-default">View Raw</a>
{{end}}
</div>
{{else}}
{{if .ReadmeExist}}
<div class="panel-body file-body markdown">
{{.FileContent|str2html}}
</div>
{{else}}
<div class="panel-body file-body file-code code-view">
<table>
<tbody>
<tr>
<td class="lines-num"></td>
<td class="lines-code markdown"><pre class="prettyprint linenums{{if .FileExt}} lang-{{.FileExt}}{{end}}">{{.FileContent}}</pre></td>
</tr>
</tbody>
</table>
</div>
{{end}}
{{end}}
</div>
9 changes: 0 additions & 9 deletions tests/.travel.yml

This file was deleted.

13 changes: 0 additions & 13 deletions tests/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions tests/default_test.go

This file was deleted.

0 comments on commit 59d0e73

Please sign in to comment.