Merge groups

handlers/handlers.go

@@ -60,10 +60,8 @@ var (
 		"students",
 		"offices",
 		"administratives",
-
 		"documents",
 		"jobs",
-
 		"groups",
 	}
 )

orm/mappings.go

@@ -91,7 +91,7 @@ var (
 		"/api/administratives/add/":        GetNothing,
 
 		// Documents
-		
+
 		"/documents":              GetDocumentsAll,
 		"/documents/{id}":         GetDocumentAll,
 		"/documents/{id}/update":  GetDocumentForUpdate,
@@ -113,7 +113,7 @@ var (
 		"/api/jobs/add/": GetNothing,
 
 		// Groups
-		
+
 		"/groups":             GetGroupsAll,
 		"/groups/{id}":        GetGroupAll,
 		"/groups/{id}/update": GetGroupForUpdate,
@@ -123,7 +123,6 @@ var (
 		"/api/groups/{id}":        GetGroupAll,
 		"/api/groups/{id}/update": GetGroup,
 		"/api/groups/add/":        GetNothing,
-
 	}
 
 	Post map[string]PostFn = map[string]PostFn{
@@ -216,8 +215,9 @@ var (
 
 		"/api/jobs/{id}/update": UpdateJob,
 		"/api/jobs/{id}/delete": DeleteJob,
-=======
+
 		// Groups
+
 		"/groups/{id}/update": UpdateGroup,
 		"/groups/{id}/delete": DeleteGroup,
 		"/groups/add/":        AddGroup,
@@ -225,6 +225,5 @@ var (
 		"/api/groups/{id}/update": UpdateGroup,
 		"/api/groups/{id}/delete": DeleteGroup,
 		"/api/groups/add/":        AddGroup,
->>>>>>> groups
 	}
 )

templates/layout/base.html.tpl

@@ -43,10 +43,10 @@
 	     <a class="nav-item nav-link" href="/administratives?{{query "tpl_layout" "base" "tpl_content" "administratives"}}">ATA</a>
 	   </li>
            <li class="nav-item">
-	     <a class="nav-item nav-link" href="/documents?{{query "tpl_layout" "base" "tpl_content" "documents"}}">Documenti<span class="badge badge-danger experimental">Sperimentale</span></a>
-	   </li>
+	     <a class="nav-item nav-link" href="/groups?{{query "tpl_layout" "base" "tpl_content" "groups"}}">Gruppi<span class="badge badge-danger experimental">Sperimentale</span></a>
+	   </li>           
            <li class="nav-item">
-	     <a class="nav-item nav-link" href="/groups?{{query "tpl_layout" "base" "tpl_content" "groups"}}">Gruppi</a>
+	     <a class="nav-item nav-link" href="/documents?{{query "tpl_layout" "base" "tpl_content" "documents"}}">Documenti<span class="badge badge-danger experimental">Sperimentale</span></a>
 	   </li>
 	  </ul>
 

watch.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 echo "Executing Makefile..."
 
 make -k