tagged as 1.14.1

.semver_git_tag

@@ -1 +1 @@
-1.13.3
+1.14.1

lang/master/tpl/design.mtt

@@ -123,60 +123,8 @@
 			</div>
 		</div>-->
 
-		<div class="row" id="footer">
+		::use 'footer.mtt'::
+		::end::
 
-				<div class="col-md-2" >
-					<img width="120" style="border: white 5px solid;" src="/img/logo-mini.jpg" alt="::_("Cagette.net")::" title="Logo ::_("Cagette.net")::"/>
-				</div>
-
-				<div class="col-md-7" style="padding-top:1em">
-					Cagette Péi est un logiciel libre qui favorise les circuits courts.<br/>
-					Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.<br/>
-				</div>
-
-				<div class="col-md-3" >
-					::_("HELP")::
-					<ul>
-						<li>
-							<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a>
-						</li>
-						<li>
-							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</a>
-						</li>
-						<li>
-							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Soumettre une anomalie</a>
-						</li>
-					</ul>
-
-				</div>
-
-		</div>
-
-		<div class="row" id="subfooter">
-			<p>
-				version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a>
-			</p>
-			::if BANDEAU_REGION::
-			<img src='/img/bandeau_region.png' alt='bandeau Région Réunion' width='250'></img>
-			::end::
-
-		</div>
-
-		<div class="row">
-			<div class="col-md-12">
-				<!--  SQL LOG -->
-				<table class="sqlLog table table-bordered" ::cond sqlLog::>
-				::foreach r sqlLog::
-				<tr ::attr class if(r.bad) 'badSql'::>
-					<td>::r.t::ms</td>
-					<td>::r.length::</td>
-					<td><a href="#" onclick="javascript:alert('::r.explain::');return false;">Exp</a></td>
-					<td><a href="#" onclick="javascript:alert('::r.stack::');return false;">Stack</a></td>
-					<td>::r.sql::</td>
-				</tr>
-				::end::
-				</table>
-			</div>
-		</div>
 
 ::end::

lang/master/tpl/footer.mtt

@@ -0,0 +1,55 @@
+		<div class="row" id="footer">
+
+				<div class="col-md-2" >
+					<img width="120" style="border: white 5px solid;" src="/img/logo-mini.jpg" alt="::_("Cagette.net")::" title="Logo ::_("Cagette.net")::"/>
+				</div>
+
+				<div class="col-md-7" style="padding-top:1em">
+					Cagette Péi est un logiciel libre qui favorise les circuits courts.<br/>
+					Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.<br/>
+				</div>
+
+				<div class="col-md-3" >
+					::_("HELP")::
+					<ul>
+						<li>
+							<a href="https://wiki.cagette.net/doku.php" target="_blank">::_("Documentation")::</a>
+						</li>
+						<li>
+							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</a>
+						</li>
+						<li>
+							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Soumettre une anomalie</a>
+						</li>
+					</ul>
+
+				</div>
+
+		</div>
+
+		<div class="row" id="subfooter">
+			<p>
+				version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a>
+			</p>
+			::if BANDEAU_REGION::
+			<img src='/img/bandeau_region_france_relance.png' alt='bandeau Région Réunion' width='250'></img>
+			::end::
+
+		</div>
+
+		<div class="row">
+			<div class="col-md-12">
+				<!--  SQL LOG -->
+				<table class="sqlLog table table-bordered" ::cond sqlLog::>
+				::foreach r sqlLog::
+				<tr ::attr class if(r.bad) 'badSql'::>
+					<td>::r.t::ms</td>
+					<td>::r.length::</td>
+					<td><a href="#" onclick="javascript:alert('::r.explain::');return false;">Exp</a></td>
+					<td><a href="#" onclick="javascript:alert('::r.stack::');return false;">Stack</a></td>
+					<td>::r.sql::</td>
+				</tr>
+				::end::
+				</table>
+			</div>
+		</div>

lang/master/tpl/group/view.mtt

@@ -1,6 +1,6 @@
 ::use 'base.mtt'::
 
-	
+<div class="row header" style="margin-top:10px;">
 	<div class="col-md-8 col-md-offset-2" style="margin-top:12px;">
 
 		<!-- Notifications -->
@@ -13,19 +13,19 @@
 					::else::
 					<span class="glyphicon glyphicon-ok"></span>
 					::end::
-					
+
-					::raw notification.text::					
+					::raw notification.text::
 				</div>
 				::end::
-			</div>	
+			</div>
 		</div>
-		
+
 		<div class="article">
-			
+
 			<div class="row">
 				<div class="col-md-4">
 					<p>
-						
+
 					::if group._image!=null::
 
 					   ::if group.extUrl!=null && group.extUrl!=""::
@@ -36,21 +36,21 @@
 
 					::end::
 					</p>
-					
+
 					<p>
-						
+
 					::if isMember::
 						<!-- connected and member of the group-->
 						<a href="/user/choose?amap=::group.id::" class="btn btn-primary">
 							<span class="glyphicon glyphicon-chevron-right"></span>
 							 ::_("Go to my account")::
 						</a>
-					
+
 					::else::
-					
+
 						<h4>Inscriptions :</h4>
 						::switch group._regOption::
-						
+
 						::case::
 							<p>
 								::_("Contact the person in charge in order to subscribe to this group and get to know membership conditions.")::
@@ -71,7 +71,7 @@
 								::_("Subscription on waiting list")::
 							</a>
 							</p>
-							
+
 						::case::
 							<p>
 								<a href="/group/register/::group.id::"  class="btn btn-primary">
@@ -84,12 +84,12 @@
 								::_("This group is full and do not accept any more subscription.")::
 							</p>
 						::end::
-					
+
 					::end::
-						
+
-					
+
 					</p>
-					
+
 					::if user==null::
 						<hr />
 						<h4>::_("Already member? Log in:")::</h4>
@@ -97,26 +97,26 @@
 							<a href="#" onclick="_.loginBox('/group/::group.id::')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-user"></span> ::_("Log in")::</a>
 						</div>
 					::end::
-					
+
 				</div>
 				<div class="col-md-8">
-					
+
 					<h2>
 						::group.name::
 					</h2>
-					
+
 					<p>
 						::if group.txtIntro!=null && group.txtIntro!=""::
 							::raw nl2br(group.txtIntro)::
 						::end::
 					</p>
-					
+
-					
+
 					<p>
 						<h3> ::_("Next deliveries")::</h3>
-						
+
 						::foreach d group.getDeliveries(4)::
-						
+
 							<div style="display:inline-block;margin-right:8px;vertical-align:top;">
 							::set s = getDate( d.date )::
 							::if isToday(d.date)::
@@ -125,15 +125,15 @@
 								$$date(::s.dow::,::s.d::,::s.m::,::s.y::,::d._place::)
 							::end::
 							</div>
-					
+
 						::end::
 					</p>
-					
+
 					<hr/>
-					
+
 					<p ::cond group._contact!=null::>
 						<h3>::_("Contact")::</h3>
-						
+
 						<i class="icon-user"></i>
  						<b>::group._contact.firstName:: ::group._contact.lastName::</b><br/>
  						<span ::cond group._contact.email!=null::>
@@ -144,52 +144,49 @@
  							<span class="glyphicon glyphicon-phone-alt"></span>  ::group._contact.phone::<br/>
  						</span>
 					</p>
-					
+
 					<hr/>
-					
+
 					<p>
 						<h3>::_("Suppliers and products")::</h3>
 						<p>
 							::_("Non-complete extract of available products:")::
 						</p>
-				
+
 						::foreach c contracts::
 						<p>
 							<b>::c.name::</b><br/>
 							::c._vendor.name::, $$nullSafe(::c._vendor.zipCode::) $$nullSafe(::c._vendor.city::)
 							<div class="row">
 								::foreach p c.getProductsPreview(6)::
-								<div class="col-md-2" data-toggle="tooltip" data-placement="top" title="::p.name::" >									
+								<div class="col-md-2" data-toggle="tooltip" data-placement="top" title="::p.name::" >
-									<div style="background-image:url('::p.getImage()::')" class="productImg"/> 
+									<div style="background-image:url('::p.getImage()::')" class="productImg"/>
 								</div>
-								::end::	
+								::end::
 							</div>
-						</p>	
+						</p>
 						::end::
-				
+
 					</p>
-					
+
 				</div>
 			</div>
-			
+
-			
+
-			
+
-			
+
-			
+
 			<div class="col-md-4">
-				
+
 			</div>
-			
+
-			
+
 		</div>
 
 	</div>
-	
+
-	<div class="col-md-12">
+</div>
-		<div id="footer">
+::use 'footer.mtt'::
-			<a href="::_("http://www.cagette.net")::">::_("Cagette.net, the free software of food direct-selling")::</a>.	
+::end::
-		</div>
-		
-	</div>
 
 ::end::

package.json

@@ -1 +1 @@
-{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.13.3"}
+{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.14.1"}

src/controller/Main.hx

@@ -29,8 +29,10 @@ class Main extends Controller {
 		if ( app.user!=null && group == null) {
 			throw Redirect("/user/choose");
 		}else if (app.user == null && (group==null || group.regOption!=db.Amap.RegOption.Open) ) {
-			//throw Redirect("/user/login");
+
-			throw Redirect("/group/1");
+			if (db.Amap.manager.get(1, false) != null) throw Redirect("/group/1");
+			else throw Redirect("/user/login");
+
 		}
 
 		view.amap = group;