Andreas Stenius avatar Andreas Stenius committed e387a4a

Intermediate commit.

Comments (0)

Files changed (4)

     z_path:files_subdir(filename:join("zmr_repos", z_convert:to_list(RepoId)), Context).
 
 repo_source(RepoId, Context) ->
-    m_rsc:p(RepoId, zmr_repository_path, Context).
+    m_rsc:p(RepoId, zmr_repository_url, Context).
 
 get_cmd(RepoId, Context, [Op|Vars]) when is_atom(Op) ->
     OpProp = case Op of
 	 {title, <<"Mercurial (hg)">>},
 	 {zmr_command, <<"hg">>},
 	 {zmr_arg_clone, <<"clone --noupdate $source $target">>},
-	 {zmr_arg_log, <<"log">>}
+	 {zmr_arg_log, <<"log">>},
+	 {zmr_log_re, <<"">>}
 	]},
 
        {zmr_scm_git,
 	 {zmr_command, <<"git">>},
 	 {zmr_arg_clone, <<"clone --no-checkout $source $target">>},
 	 {zmr_arg_log, <<"log">>}
+	 {zmr_log_re, <<"">>}
 	]},
 	
        {zmr_repo,
 	 {title, <<"mod_zmr">>},
 	 {summary, <<"The Module for ZMR itself.">>},
 	 {body, <<"Zotonic Modules Repository (zmr) is a server for hosting releases of zotonic modules.">>},
-	 {zmr_repository_path, <<"https://bitbucket.astekk.se/zmr">>}
+	 {zmr_repository_url, <<"https://bitbucket.astekk.se/zmr">>}
 	]}
 %,
 %       {zmr_default_release,
 
 m_to_list(#m{value={repo_log, Log}}=M, _Context) ->
     [M#m{value={repo_log_entry, Entry}} || Entry <- Log];
+m_to_list(#m{value={repo_log_entry, Entry}}, _Context) ->
+    Entry;
 
 m_to_list(_, _) ->
     undefined.

templates/_admin_edit_content.zmr_repository.tpl

 <fieldset class="admin-form">
 
 <div class="form-item clearfix">
-<label for="zmr_repository_path">{_ Repository path _}</label>
-<input id="zmr_repository_path" type="text" name="zmr_repository_path" value="{{ r.zmr_repository_path }}" style="width: 80%" />
+<label for="zmr_repository_url">{_ Repository URL _}</label>
+<input id="zmr_repository_url" type="text" name="zmr_repository_url" value="{{ r.zmr_repository_url }}" style="width: 80%" />
 
 <div id="repo_status">
 {% if m.zmr.repo[id].exist %} 

templates/_admin_edit_content.zmr_scm_tool.tpl

 				<input id="zmr_arg_log" type="text" name="zmr_arg_log" value="{{ r.zmr_arg_log }}" style="width: 80%" />
 			</div>
 
+			<div class="form-item clearfix">
+				<label for="zmr_log_re">{_ Log Parser (Regular Expression, PCRE) _}</label>
+				<input id="zmr_log_re" type="text" name="zmr_log_re" value="{{ r.zmr_log_re }}" style="width: 80%" />
+			</div>
+
 		</fieldset>
 	</div>
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.